rpms/ochusha/F-10 .cvsignore, 1.45, 1.46 ochusha.sh, 1.1, 1.2 ochusha.spec, 1.59, 1.60 sources, 1.45, 1.46 ochusha-0.5.99.66-cvs070110-disable-lock-check.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32468/F-10

Modified Files:
	.cvsignore ochusha.sh ochusha.spec sources 
Removed Files:
	ochusha-0.5.99.66-cvs070110-disable-lock-check.patch 
Log Message:
Also update F-10/9 ochusha to 0.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-10/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	1 Dec 2008 05:36:53 -0000	1.45
+++ .cvsignore	26 Dec 2008 06:39:55 -0000	1.46
@@ -1 +1 @@
-ochusha-0.5.99.68-cvs20081201T1430.tar.bz2
+ochusha-0.6.0.1-cvs20081226T1200.tar.bz2


Index: ochusha.sh
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-10/ochusha.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ochusha.sh	27 Oct 2008 15:48:45 -0000	1.1
+++ ochusha.sh	26 Dec 2008 06:39:55 -0000	1.2
@@ -14,7 +14,7 @@
 fi
 if [ ! -f $HOME/.ochusha/ochusha-prefs-gtkrc ]
 then
-	install -c -p -m 0644 $DATADIR/ochusha-prefs-gtkrc $HOME/.ochusha/
+	install -c -p -m 0600 $DATADIR/ochusha-prefs-gtkrc $HOME/.ochusha/
 fi
 
 exec $LIBEXECDIR/ochusha $@


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-10/ochusha.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ochusha.spec	1 Dec 2008 05:36:53 -0000	1.59
+++ ochusha.spec	26 Dec 2008 06:39:55 -0000	1.60
@@ -11,15 +11,17 @@
 
 
 %define		with_system_ca_cert_file	1
+%define		with_external_onig		1
 %define		system_ca_cert_file		%{_sysconfdir}/pki/tls/cert.pem
+%define		help_url			file://%{_docdir}/%{name}-%{version}/doc/index.html
 
-%define		main_ver	0.5.99.68
-%define		codate		20081201
-%define		cotime_JST	1430
+%define		main_ver	0.6.0.1
+%define		codate		20081226
+%define		cotime_JST	1200
 %define		strtag		cvs%{codate}T%{cotime_JST}
-%define		repoid		16560
+%define		repoid		36733
 
-%define		vendor_rel	4
+%define		vendor_rel	2
 %define		pre_release	1
 
 %if %{pre_release}
@@ -40,7 +42,7 @@
 %endif
 Source10:	ochusha-prefs-gtkrc
 Source11:	ochusha.sh
-Patch0:		ochusha-0.5.99.66-cvs070110-disable-lock-check.patch
+#Patch10:	ochusha-build-20081207T0000.diff
 License:	BSD
 Group:		Applications/Internet
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,44 +76,40 @@
 %setup -q
 %endif
 
-# Try if this is no longer needed
-%if 0
-%patch0 -p1 -b .lock
-%endif
-
 # Icon path fix
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48|' ochusha/ochusha.desktop.in
 
 # set xdg-open as a default browser
 %{__sed} -i -e 's|firefox|xdg-open|' ochusha/ui_constants.h
 
+%if %{pre_release}
 sh autogen.sh
+%endif
 
 %build
 export LDFLAGS="-Wl,--rpath,%{_libdir}/%{name}"
 %configure \
+%if %{with_external_onig}
 	--with-external-oniguruma \
+%endif
 %if %{with_system_ca_cert_file}
 	--with-ca-cert-file=%{system_ca_cert_file} \
 %endif
+	--with-help-url=%{help_url} \
 	--bindir=%{_libexecdir} \
 	--libdir=%{_libdir}/%{name}
 
-%{__make} %{?_smp_flags}
+%{__make} %{?_smp_flags} -k
 
 %install
 %{__rm} -rf %{buildroot}
+%{__rm} -rf DOCs/
+
 %{__make} \
 	DESTDIR=%{buildroot} \
 	INSTALL="%{__install} -p" \
 	install
 
-%{__mkdir_p} %{buildroot}%{_bindir}
-%{__install} -cpm 0755 %{SOURCE11} \
-	%{buildroot}%{_bindir}/%{name}
-%{__install} -cpm 0644 %{SOURCE10} \
-	%{buildroot}%{_datadir}/%{name}/ochusha-prefs-gtkrc
-
 # find lang
 %find_lang %{name}
 %find_lang %{name}-properties
@@ -119,19 +117,32 @@
 %{__cat} %{name}.lang %{name}-properties.lang > all.lang
 
 # Licenses.
-if test -f "oniguruma/COPYING"; then
-	%{__mv} oniguruma/COPYING oniguruma/COPYING.oniguruma
-fi
-if test -f "libochushagtk_lgpl/COPYING"; then
-	%{__mv} libochushagtk_lgpl/COPYING libochushagtk_lgpl/COPYING.libochushagtk_lgpl
-fi
+%{__mkdir} DOCs/
+%if ! %{with_external_onig}
+%{__mkdir_p} DOCs/oniguruma
+%{__cp} -p DOCs/oniguruma/COPYING DOCs/oniguruma/
+%endif
+%{__mkdir_p} DOCs/libochushagtk_lgpl
+%{__cp} -p libochushagtk_lgpl/COPYING DOCs/libochushagtk_lgpl/
 
 # remove unneeded files
 %{__rm} -f %{buildroot}/%{_libdir}/%{name}/*.{a,la,so}
 %if %{with_system_ca_cert_file}
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
-%{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
 %endif
+pushd %{buildroot}/%{_datadir}/%{name}
+rm -f *.{gif,html} \
+	ochusha-* \
+	ochusha.png \
+	[a-np-z]*.png
+popd
+
+# Install wrapper script, default setting
+%{__mkdir_p} %{buildroot}%{_bindir}
+%{__install} -cpm 0755 %{SOURCE11} \
+	%{buildroot}%{_bindir}/%{name}
+%{__install} -cpm 0644 %{SOURCE10} \
+	%{buildroot}%{_datadir}/%{name}/ochusha-prefs-gtkrc
 
 # install desktop file and delete original
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
@@ -167,6 +178,14 @@
 	BUGS ChangeLog NEWS README TODO \
 	ochusha/ochusha-gtkrc.gray
 
+# Another documents
+%{__mkdir_p} DOCs/ochusha
+
+%{__cp} -a doc/ DOCs/
+%{__rm} -rf DOCs/doc/Makefile* DOCs/doc/*.in DOCs/doc/CVS/
+%{__cp} -p ochusha/ochusha-* DOCs/ochusha/
+%{__rm} -f DOCs/ochusha/ochusha-*.h
+
 %clean
 %{__rm} -rf %{buildroot}/
 
@@ -186,9 +205,7 @@
 %doc	NEWS 
 %doc	README 
 %doc	TODO
-%doc	ochusha/ochusha-gtkrc.*
-#%%doc oniguruma/COPYING.oniguruma
-%doc	libochushagtk_lgpl/COPYING.libochushagtk_lgpl
+%doc	DOCs/*
 
 %{_bindir}/%{name}
 %{_libexecdir}/%{name}
@@ -200,8 +217,14 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Mon Dec  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Use latest CVS
+* Fri Dec 26 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- 2008-12-26 12:00
+- Hopely fix the issue on /linux/1148809116/612
+- Fix the permission of ochusha-prefs-gtkrc
+
+* Wed Dec 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-3
+- 0.6
+- Fix default document HTML place
 
 * Tue Oct 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.99.67.1-0.4.cvs20081023T0304
 - Install ochusha-prefs-gtkrc to set default font


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/F-10/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	1 Dec 2008 05:36:53 -0000	1.45
+++ sources	26 Dec 2008 06:39:55 -0000	1.46
@@ -1 +1 @@
-3873989781224c1e213a3be71b2b3bb4  ochusha-0.5.99.68-cvs20081201T1430.tar.bz2
+0920f5f375c59296d9e6b13b75bc3e95  ochusha-0.6.0.1-cvs20081226T1200.tar.bz2


--- ochusha-0.5.99.66-cvs070110-disable-lock-check.patch DELETED ---