rpms/tomoe/FC-6 tomoe-modules-noversion.patch, NONE, 1.1 sources, 1.4, 1.5 tomoe.spec, 1.20, 1.21

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/tomoe/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22517

Modified Files:
	sources tomoe.spec 
Added Files:
	tomoe-modules-noversion.patch 
Log Message:
sync with devel:
- update to 0.5.1
- add tomoe-modules-noversion.patch to unversion .so modules (#227623)
- improve the filelists (#227453)
- add more doc files including new html files for kanjidic
- moved gtk-doc files to devel
- make config file noreplace


tomoe-modules-noversion.patch:

--- NEW FILE tomoe-modules-noversion.patch ---
diff -ur tomoe-0.5.1/module/dict/Makefile.am tomoe-0.5.1/module/dict/Makefile.am
--- tomoe-0.5.1/module/dict/Makefile.am	2006-12-27 11:17:28.000000000 +1000
+++ tomoe-0.5.1/module/dict/Makefile.am	2007-02-15 12:14:10.000000000 +1000
@@ -44,6 +44,7 @@
 dict_module_LTLIBRARIES = libxml.la
 
 libxml_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:XML\" $(AM_CPPFLAGS)
+libxml_la_LDFLAGS = -avoid-version
 libxml_la_SOURCES = tomoe-dict-xml.c $(ptr_array_based_dict_sources)
 
 if WITH_EST
@@ -75,6 +76,7 @@
 EXTRA_DIST = unihan-compiler.rb $(BUILT_SOURCES) Unihan.stamp
 
 libunihan_la_CPPFLAGS = -DG_LOG_DOMAIN=\"Tomoe/Dict:Unihan\" $(AM_CPPFLAGS)
+libunihan_la_LDFLAGS = -avoid-version
 libunihan_la_SOURCES =		\
 	tomoe-dict-unihan.c	\
 	tomoe-unihan.c		\
diff -ur tomoe-0.5.1/module/recognizer/Makefile.am tomoe-0.5.1/module/recognizer/Makefile.am
--- tomoe-0.5.1/module/recognizer/Makefile.am	2006-12-27 11:17:28.000000000 +1000
+++ tomoe-0.5.1/module/recognizer/Makefile.am	2007-02-15 12:15:47.000000000 +1000
@@ -32,7 +32,7 @@
 	tomoe-recognizer-simple-logic.h
 
 libsimple_la_LDFLAGS =						\
-  -version-info $(LT_VERSION_INFO)				\
+  -avoid-version						\
   -export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS)
 
 libsimple_la_LD_ADD = \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Jan 2007 02:38:30 -0000	1.4
+++ sources	7 Mar 2007 09:03:40 -0000	1.5
@@ -1 +1 @@
-8a5abae3a1c388e497c6952e45db5bbd  tomoe-0.5.0.tar.gz
+84b103ef8240bf0d76f1083b2cf3521b  tomoe-0.5.1.tar.gz


Index: tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/tomoe/FC-6/tomoe.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tomoe.spec	21 Jan 2007 06:19:40 -0000	1.20
+++ tomoe.spec	7 Mar 2007 09:03:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           tomoe
-Version:        0.5.0
-Release:        2%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 Summary:        Japanese handwritten input system
 
 Group:          System Environment/Libraries
@@ -9,6 +9,7 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  glib2-devel
+Patch1:         tomoe-modules-noversion.patch
 
 %description
 A program which does Japanese handwriting recognition.
@@ -26,20 +27,20 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-version~
 
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libtomoe.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/dict/libxml.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/dict/libunihan.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/module/recognizer/libsimple.{a,la}
+# remove .la files
+find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,37 +48,40 @@
 
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
+%doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html
 %{_libdir}/libtomoe.so.*
-%dir %{_libdir}/tomoe
-%{_libdir}/tomoe/module/dict/libxml.so.*
-%{_libdir}/tomoe/module/dict/libunihan.so.*
-%{_libdir}/tomoe/module/recognizer/libsimple.so.*
-%dir %{_datadir}/tomoe
-%{_datadir}/tomoe/*
-%dir %{_datadir}/gtk-doc/html/tomoe/
-%{_datadir}/gtk-doc/html/tomoe/*
+%{_libdir}/tomoe
+%{_datadir}/tomoe
 %dir %{_sysconfdir}/tomoe
-%config %{_sysconfdir}/tomoe/config
+%config(noreplace) %{_sysconfdir}/tomoe/config
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libtomoe.so
-%{_libdir}/tomoe/module/dict/libxml.so
-%{_libdir}/tomoe/module/dict/libunihan.so
-%{_libdir}/tomoe/module/recognizer/libsimple.so
-%dir %{_includedir}/tomoe
-%{_includedir}/tomoe/*
+%{_includedir}/tomoe
 %{_libdir}/pkgconfig/tomoe.pc
+%{_datadir}/gtk-doc/html/tomoe
 
 
 %changelog
+* Thu Feb 15 2007 Jens Petersen <petersen at redhat.com> - 0.5.1-1
+- update to 0.5.1
+- add tomoe-modules-noversion.patch to unversion .so modules (#227623)
+- improve the filelists (#227453)
+- add more doc files including new html files for kanjidic
+- moved gtk-doc files to devel
+- make config file noreplace
+
+* Sat Jan 20 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.0-2
+- do not buildrequire libtomoe-gtk
+
 * Sat Jan 20 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.0-1
 - update to 0.5.0.