rpms/ochusha/devel .cvsignore, 1.7, 1.8 ochusha.spec, 1.7, 1.8 sources, 1.7, 1.8

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/ochusha/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703

Modified Files:
	.cvsignore ochusha.spec sources 
Log Message:
* Mon Nov 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.63.5-0.1.cvs061120
- 0.5.99.63.5 cvs 061120 (20:00 JST)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Nov 2006 17:30:59 -0000	1.7
+++ .cvsignore	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-ochusha-0.5.99.63.3-cvs061116.tar.bz2
+ochusha-0.5.99.63.5-cvs061120.tar.bz2


Index: ochusha.spec
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/ochusha.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ochusha.spec	16 Nov 2006 17:30:59 -0000	1.7
+++ ochusha.spec	21 Nov 2006 07:43:13 -0000	1.8
@@ -1,10 +1,10 @@
 %define              with_system_ca_cert_file    1
 %define              system_ca_cert_file         %{_sysconfdir}/pki/tls/cert.pem
 
-%define              main_ver        0.5.99.63.3
-%define              strtag          cvs061116
+%define              main_ver        0.5.99.63.5
+%define              strtag          cvs061120
 
-%define              vendor_rel      2
+%define              vendor_rel      1
 %define              pre_release     1
 
 %if %{pre_release}
@@ -53,8 +53,7 @@
 %setup -q
 %endif
 
-# change desktop entry to use png file in 
-# %{icondir}
+# change desktop entry to use png file at %%{icondir}.
 %{__sed} -i -e 's|Icon.*$|Icon=ochusha48.png|' ochusha/ochusha.desktop.in
 
 %build
@@ -75,15 +74,20 @@
 %find_lang %{name}
 %find_lang %{name}-properties
 
-%{__cat} *.lang > all.lang
+%{__cat} %{name}.lang %{name}-properties.lang > all.lang
 
-# License
+# 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
 
 # remove unneeded files
-%{__rm} -f %{buildroot}%{_libdir}/lib*.{a,la,so}
+%{__rm} -f %{buildroot}/%{_libdir}/*.a
+%{__rm} -f %{buildroot}/%{_libdir}/*.la
+%{__rm} -f %{buildroot}/%{_libdir}/*.so
 %if %{with_system_ca_cert_file}
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ca-bundle.crt
 %{__rm} -f %{buildroot}/%{_datadir}/%{name}/ochusha-gtkrc*
@@ -98,10 +102,10 @@
       --dir %{buildroot}%{_datadir}/applications \
       %{buildroot}%{_datadir}/ochusha/%{name}.desktop
 
-# link Icon png to icondir
+# link icon to icondir according to Icon Theme Specification.
 %{__mkdir_p} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-ln -sf ../../../../ochusha/ochusha48.png \
-   %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+%{__ln_s} -f ../../../../ochusha/ochusha48.png \
+	%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 # change documents' encoding to UTF-8.
 change_encoding(){
@@ -133,30 +137,36 @@
 
 %files -f all.lang
 %defattr(-,root,root)
-# BUGS is empty for now, however I include it for now.
 %doc ACKNOWLEDGEMENT AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 %doc ochusha/ochusha-gtkrc.*
 %doc oniguruma/COPYING.oniguruma
+%doc libochushagtk_lgpl/COPYING.libochushagtk_lgpl
 
 %{_bindir}/ochusha
+%{_datadir}/%{name}/*
+%{_datadir}/applications/fedora-%{name}.desktop
+%dir %{_datadir}/%{name}
 %{_libdir}/lib*
+%{_mandir}/man1/%{name}.1*
 
-%{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
-
-%{_mandir}/man1/%{name}.1*
-
 %changelog
-* Thu Nov 16 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.63.3-0.2.cvs061116
-- Update to 0.5.99.63.3 cvs 061116
+* Mon Nov 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.99.63.5-0.1.cvs061120
+- 0.5.99.63.5 cvs 061120 (20:00 JST)
+
+* Sat Nov 18 2006 <fuyu at users.sourceforge.jp>
+- COPYING files of oniguruma and libochushagtk_lgpl will be installed
+  as COPYING.oniguruma and COPYING.libochushagtk_lgpl.
 
 * Fri Nov 03 2006 <fuyu at users.sourceforge.jp> 0.5.99.62-1
 - Version down.
 - Specify the CA certificate file bundled within openssl package.
 
+* Mon Sep 19 2006 <fuyu at users.sourceforge.jp> 0.6-1
+- Version up.
+- Change request fields for gtk+-2.6 and libxml2-2.6.
+
 * Sat Aug 26 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.5.8.2-3
 - Install (link) icon to the usual directory and use 
   cache updating method.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ochusha/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Nov 2006 17:30:59 -0000	1.7
+++ sources	21 Nov 2006 07:43:13 -0000	1.8
@@ -1 +1 @@
-a4f068bb0c128688a050bda77c1a31cb  ochusha-0.5.99.63.3-cvs061116.tar.bz2
+d3ce8f7cfe119ab7490cb4043d8357bb  ochusha-0.5.99.63.5-cvs061120.tar.bz2