rpms/ochusha/devel .cvsignore, 1.64, 1.65 ochusha.spec, 1.84, 1.85 sources, 1.64, 1.65

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23141

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Wed Dec 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-1
- 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	21 Dec 2008 05:29:03 -0000	1.64
+++ .cvsignore	24 Dec 2008 05:32:20 -0000	1.65
@@ -1 +1 @@
-ochusha-0.5.99.71-cvs20081221T1420.tar.bz2
+ochusha-0.6.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ochusha.spec	21 Dec 2008 05:29:03 -0000	1.84
+++ ochusha.spec	24 Dec 2008 05:32:20 -0000	1.85
@@ -11,16 +11,18 @@
 
 
 %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}/index.html
 
-%define		main_ver	0.5.99.71
+%define		main_ver	0.6
 %define		codate		20081221
 %define		cotime_JST	1420
 %define		strtag		cvs%{codate}T%{cotime_JST}
-%define		repoid		16560
+%define		repoid		36733
 
-%define		vendor_rel	4
-%define		pre_release	1
+%define		vendor_rel	1
+%define		pre_release	0
 
 %if %{pre_release}
 %define		rel		0.%{vendor_rel}.%{strtag}%{?dist}
@@ -40,7 +42,6 @@
 %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
@@ -75,27 +76,26 @@
 %setup -q
 %endif
 
-# Try if this is no longer needed
-%if 0
-%patch0 -p1 -b .lock
-%endif
-#%%patch10 -p0 -b .build
-
 # 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}
 
@@ -103,17 +103,13 @@
 
 %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
@@ -121,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
@@ -169,6 +178,14 @@
 	BUGS ChangeLog NEWS README TODO \
 	ochusha/ochusha-gtkrc.gray
 
+# Another documents
+%{__mkdir_p} DOCs/ochusha
+
+%{__cp} -a doc/ DOCs/
+%{__rm} -f 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}/
 
@@ -188,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}
@@ -202,8 +217,8 @@
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
 %changelog
-* Sun Dec 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- Use latest CVS
+* Wed Dec 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6-1
+- 0.6
 
 * 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/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	21 Dec 2008 05:29:03 -0000	1.64
+++ sources	24 Dec 2008 05:32:20 -0000	1.65
@@ -1 +1 @@
-8f43cb79c8ce01f7b9fab98f7d6a8d07  ochusha-0.5.99.71-cvs20081221T1420.tar.bz2
+0b049647a84199f9105c02dab5be2d29  ochusha-0.6.tar.bz2