From 3f30ededf09bc0d330658a2b9893823a879b9d8e Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Wed, 7 Sep 2005 09:28:46 +0000 Subject: [PATCH 01/90] auto-import tomoe-0.2.1-3 on branch devel from tomoe-0.2.1-3.src.rpm --- .cvsignore | 1 + sources | 1 + tomoe.spec | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 tomoe.spec diff --git a/.cvsignore b/.cvsignore index e69de29..342a9a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +tomoe-0.2.1.tar.gz diff --git a/sources b/sources index e69de29..76350d2 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +95eca127a1d519ff4e836b3d00d7fa84 tomoe-0.2.1.tar.gz diff --git a/tomoe.spec b/tomoe.spec new file mode 100644 index 0000000..f9b7701 --- /dev/null +++ b/tomoe.spec @@ -0,0 +1,84 @@ +Name: tomoe +Version: 0.2.1 +Release: 3%{?dist} +Summary: Japanese handwritten input system + +Group: System Environment/Libraries +License: LGPL +URL: http://scim-imengine.sourceforge.jp/ +Source0: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +A program which does Japanese handwriting recognition. + + +%package devel +Summary: tomoe +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The tomoe-devel package includes the header files for the tomoe package. +Install this package if you want to develop programs which use tomoe. + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +%makeinstall + +rm $RPM_BUILD_ROOT%{_libdir}/libtomoe.la + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post -p/sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog +%{_bindir}/tomoe* +%{_libdir}/libtomoe.so* +%dir %{_datadir}/tomoe +%{_datadir}/tomoe/* + + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/tomoe +%{_includedir}/tomoe/* +%{_libdir}/pkgconfig/tomoe.pc + + +%changelog +* Sat Sep 3 2005 Warren Togami - 0.2.1-3 +- some spec cleanup + +* Sat Sep 2 2005 Ryo Dairiki - 0.2.1-2 +- Sync with Jens's spec file + +* Wed Aug 31 2005 Ryo Dairiki - 0.2.1-1 +- Initial packaging for Extras + +* Fri Jul 1 2005 Ichiro Nakai +- (0.2.0-1m) +- version 0.2.0 +- add a package tomoe-devel +- add %%post and %%postun sections + +* Wed Mar 2 2005 Ichiro Nakai +- (0.1.1-1m) +- initial package for Momonga Linux +- import %%description from cooker From 0edf3acfc3e80b14bd0f91704cdaf01e1723701e Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Fri, 9 Sep 2005 12:39:30 +0000 Subject: [PATCH 02/90] *** empty log message *** --- tomoe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index f9b7701..7ae591a 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -41,7 +41,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/libtomoe.la rm -rf $RPM_BUILD_ROOT -%post -p/sbin/ldconfig +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig From d6b3eb0f5cf3619abbcb6bf5adf176175d2d6951 Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Wed, 1 Mar 2006 06:20:08 +0000 Subject: [PATCH 03/90] sync with libtomoe-gtk --- tomoe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 7ae591a..f8bb4e5 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From 981b35e826e534b341a797727e70104a5e6845fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:12:11 +0000 Subject: [PATCH 04/90] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 90d93fbdf2bd54e70b1b801e877b74fec5df616f Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Thu, 14 Sep 2006 23:50:27 +0000 Subject: [PATCH 05/90] mass rebuild --- tomoe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index f8bb4e5..9af46ea 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 15 2006 Ryo Dairiki - 0.2.1-5 +- mass rebuilding. + * Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 - sync with libtomoe-gtk From d6068d9f80dc0ea1a1f36ec387dd9fbce22805d0 Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Fri, 15 Sep 2006 15:27:26 +0000 Subject: [PATCH 06/90] *** empty log message *** --- tomoe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index 9af46ea..ff6f78d 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,7 +63,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Sep 15 2006 Ryo Dairiki - 0.2.1-5 +* Sat Sep 15 2006 Ryo Dairiki - 0.2.1-6 - mass rebuilding. * Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 From 673d7cb74b197e0bdaf2d21de24b4f65c351fd6d Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Fri, 15 Sep 2006 16:04:38 +0000 Subject: [PATCH 07/90] rebuild done --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 00e95005a79991752cc93e6a0a36ca19912b0c35 Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Thu, 21 Dec 2006 16:13:17 +0000 Subject: [PATCH 08/90] update to 0.4.0 --- sources | 2 +- tomoe.spec | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 76350d2..7e0b67f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95eca127a1d519ff4e836b3d00d7fa84 tomoe-0.2.1.tar.gz +239a78420d35f107c5ec9edd2fcf474a tomoe-0.4.0.tar.gz diff --git a/tomoe.spec b/tomoe.spec index ff6f78d..1bfb3c0 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,6 +1,6 @@ Name: tomoe -Version: 0.2.1 -Release: 6%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -49,10 +49,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog -%{_bindir}/tomoe* %{_libdir}/libtomoe.so* %dir %{_datadir}/tomoe %{_datadir}/tomoe/* +%dir %{_datadir}/gtk-doc/html/tomoe/ +%{_datadir}/gtk-doc/html/tomoe/* +%dir %{_sysconfdir}/tomoe +%config %{_sysconfdir}/tomoe/config %files devel @@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 21 2006 Ryo Dairiki - 0.4.0-1 +- update to 0.4.0. + * Sat Sep 15 2006 Ryo Dairiki - 0.2.1-6 - mass rebuilding. From 2433bef6ef3b986bfc8643b80511cb1188247856 Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Sat, 23 Dec 2006 05:06:25 +0000 Subject: [PATCH 09/90] Ready for updating 0.4.0 --- tomoe.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index 1bfb3c0..c4ffdd4 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -8,6 +8,7 @@ License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: glib2-devel %description A program which does Japanese handwriting recognition. @@ -33,9 +34,11 @@ make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/libtomoe.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libtomoe.la +rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/dict/libxml.la +rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/recognizer/libsimple.la %clean rm -rf $RPM_BUILD_ROOT @@ -49,7 +52,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog -%{_libdir}/libtomoe.so* +%{_libdir}/libtomoe.so.* +%{_libdir}/tomoe/dict/libxml.so.* +%{_libdir}/tomoe/recognizer/libsimple.so.* %dir %{_datadir}/tomoe %{_datadir}/tomoe/* %dir %{_datadir}/gtk-doc/html/tomoe/ @@ -60,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) +%{_libdir}/libtomoe.so +%{_libdir}/tomoe/dict/libxml.so +%{_libdir}/tomoe/recognizer/libsimple.so %dir %{_includedir}/tomoe %{_includedir}/tomoe/* %{_libdir}/pkgconfig/tomoe.pc From 8e13655bdcd1c7de52e15ecacbd62ef8ad3ac64f Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Sun, 21 Jan 2007 04:03:25 +0000 Subject: [PATCH 10/90] update to 0.5.0 --- sources | 2 +- tomoe.spec | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 7e0b67f..0673f66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -239a78420d35f107c5ec9edd2fcf474a tomoe-0.4.0.tar.gz +8a5abae3a1c388e497c6952e45db5bbd tomoe-0.5.0.tar.gz diff --git a/tomoe.spec b/tomoe.spec index c4ffdd4..c78125a 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,5 +1,5 @@ Name: tomoe -Version: 0.4.0 +Version: 0.5.0 Release: 1%{?dist} Summary: Japanese handwritten input system @@ -9,6 +9,7 @@ URL: http://scim-imengine.sourceforge.jp/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel +Requires: libtomoe-gtk = %{version}-%{release} %description A program which does Japanese handwriting recognition. @@ -36,9 +37,10 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/libtomoe.la -rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/dict/libxml.la -rm -f $RPM_BUILD_ROOT%{_libdir}/tomoe/recognizer/libsimple.la +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} %clean rm -rf $RPM_BUILD_ROOT @@ -53,8 +55,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/libtomoe.so.* -%{_libdir}/tomoe/dict/libxml.so.* -%{_libdir}/tomoe/recognizer/libsimple.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/ @@ -66,14 +70,18 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_libdir}/libtomoe.so -%{_libdir}/tomoe/dict/libxml.so -%{_libdir}/tomoe/recognizer/libsimple.so +%{_libdir}/tomoe/module/dict/libxml.so +%{_libdir}/tomoe/module/dict/libunihan.so +%{_libdir}/tomoe/module/recognizer/libsimple.so %dir %{_includedir}/tomoe %{_includedir}/tomoe/* %{_libdir}/pkgconfig/tomoe.pc %changelog +* Sat Jan 20 2007 Ryo Dairiki - 0.5.0-1 +- update to 0.5.0. + * Thu Dec 21 2006 Ryo Dairiki - 0.4.0-1 - update to 0.4.0. From 37181c9b46b3305d7e704071cf2cb3e0820f7fcf Mon Sep 17 00:00:00 2001 From: Ryo Dairiki Date: Sun, 21 Jan 2007 07:05:31 +0000 Subject: [PATCH 11/90] fix the dependecy tree --- tomoe.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index c78125a..cd39f54 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,6 +1,6 @@ Name: tomoe Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -9,7 +9,6 @@ URL: http://scim-imengine.sourceforge.jp/ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel -Requires: libtomoe-gtk = %{version}-%{release} %description A program which does Japanese handwriting recognition. From f787d052db2e29f37a2aa9108724d39f489358eb Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 15 Feb 2007 05:39:08 +0000 Subject: [PATCH 12/90] - 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 --- .cvsignore | 2 +- sources | 2 +- tomoe-modules-noversion.patch | 31 ++++++++++++++++++++++ tomoe.spec | 48 +++++++++++++++++++---------------- 4 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 tomoe-modules-noversion.patch diff --git a/.cvsignore b/.cvsignore index 342a9a6..065b26a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tomoe-0.2.1.tar.gz +tomoe-0.5.1.tar.gz diff --git a/sources b/sources index 0673f66..ed49086 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a5abae3a1c388e497c6952e45db5bbd tomoe-0.5.0.tar.gz +84b103ef8240bf0d76f1083b2cf3521b tomoe-0.5.1.tar.gz diff --git a/tomoe-modules-noversion.patch b/tomoe-modules-noversion.patch new file mode 100644 index 0000000..f12abb7 --- /dev/null +++ b/tomoe-modules-noversion.patch @@ -0,0 +1,31 @@ +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 = \ diff --git a/tomoe.spec b/tomoe.spec index cd39f54..ff05d3f 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -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 @@ URL: http://scim-imengine.sourceforge.jp/ 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 @@ Install this package if you want to develop programs which use tomoe. %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 @@ rm -rf $RPM_BUILD_ROOT %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 - 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 - 0.5.0-2 +- do not buildrequire libtomoe-gtk + * Sat Jan 20 2007 Ryo Dairiki - 0.5.0-1 - update to 0.5.0. From a6beccb1d019edd78c2779dcae1c534929ab8e9f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jun 2007 06:33:38 +0000 Subject: [PATCH 13/90] - update to 0.6.0 - tomoe-modules-noversion.patch no longer needed --- .cvsignore | 2 +- sources | 2 +- tomoe-modules-noversion.patch | 31 ------------------------------- tomoe.spec | 14 +++++++++----- 4 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 tomoe-modules-noversion.patch diff --git a/.cvsignore b/.cvsignore index 065b26a..2c1ed44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -tomoe-0.5.1.tar.gz +tomoe-0.6.0.tar.gz diff --git a/sources b/sources index ed49086..71237fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84b103ef8240bf0d76f1083b2cf3521b tomoe-0.5.1.tar.gz +0e51e88d097085e101bf722fc04808ed tomoe-0.6.0.tar.gz diff --git a/tomoe-modules-noversion.patch b/tomoe-modules-noversion.patch deleted file mode 100644 index f12abb7..0000000 --- a/tomoe-modules-noversion.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 = \ diff --git a/tomoe.spec b/tomoe.spec index ff05d3f..77a47ee 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,15 +1,14 @@ Name: tomoe -Version: 0.5.1 +Version: 0.6.0 Release: 1%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries License: LGPL URL: http://scim-imengine.sourceforge.jp/ -Source0: %{name}-%{version}.tar.gz +Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{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. @@ -27,7 +26,6 @@ Install this package if you want to develop programs which use tomoe. %prep %setup -q -%patch1 -p1 -b .1-version~ %build @@ -41,6 +39,8 @@ make install DESTDIR=$RPM_BUILD_ROOT # remove .la files find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* @@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 29 2007 Jens Petersen - 0.6.0-1 +- update to 0.6.0 +- tomoe-modules-noversion.patch no longer needed + * Thu Feb 15 2007 Jens Petersen - 0.5.1-1 - update to 0.5.1 - add tomoe-modules-noversion.patch to unversion .so modules (#227623) From a779047e17bd9edac3e83270e06616cbc6ed7226 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jun 2007 06:53:17 +0000 Subject: [PATCH 14/90] buildrequire perl-XML-Parser for intltool --- tomoe.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 77a47ee..ff24e58 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -8,7 +8,7 @@ License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel +BuildRequires: glib2-devel, perl-XML-Parser %description A program which does Japanese handwriting recognition. @@ -74,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jun 29 2007 Jens Petersen - 0.6.0-1 - update to 0.6.0 - tomoe-modules-noversion.patch no longer needed +- buildrequire perl-XML-Parser for intltool * Thu Feb 15 2007 Jens Petersen - 0.5.1-1 - update to 0.5.1 From 4c9d1f821280d319362adb672ce56346a8b16fd1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jun 2007 07:06:04 +0000 Subject: [PATCH 15/90] buildrequire python --- tomoe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index ff24e58..47ed234 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -8,7 +8,7 @@ License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel, perl-XML-Parser +BuildRequires: glib2-devel, perl-XML-Parser, python %description A program which does Japanese handwriting recognition. @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Jun 29 2007 Jens Petersen - 0.6.0-1 - update to 0.6.0 - tomoe-modules-noversion.patch no longer needed -- buildrequire perl-XML-Parser for intltool +- buildrequire perl-XML-Parser for intltool and python * Thu Feb 15 2007 Jens Petersen - 0.5.1-1 - update to 0.5.1 From d9f2fdc5866ddd2c984da68b04b38058a20b760b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 29 Jun 2007 07:18:01 +0000 Subject: [PATCH 16/90] and buildrequire gettext --- tomoe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 47ed234..fa7b936 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -8,7 +8,7 @@ License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel, perl-XML-Parser, python +BuildRequires: glib2-devel, perl-XML-Parser, python, gettext %description A program which does Japanese handwriting recognition. From 3bd18bbe9dce88a8ceeae58bd0d31a0adee5d301 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2007 03:25:59 +0000 Subject: [PATCH 17/90] - enable python binding with buildrequires pygtk2-codegen - buildrequire gtk-doc - require gtk-doc for devel package - add a build switch for ruby binding --- tomoe.spec | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index fa7b936..1cb3eae 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,23 +1,33 @@ +%define ruby_binding 0 + Name: tomoe Version: 0.6.0 -Release: 1%{?dist} -Summary: Japanese handwritten input system +Release: 2%{?dist} +Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries License: LGPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel, perl-XML-Parser, python, gettext +BuildRequires: glib2-devel, gettext, gtk-doc +BuildRequires: perl(XML::Parser), python, pygtk2-codegen +%if %{ruby_binding} +BuildRequires: ruby-glib2-devel +%endif +## for extra dictionary backends +#BuildRequires: mysql-devel, subversion-devel, hyperestraier-devel %description A program which does Japanese handwriting recognition. %package devel -Summary: tomoe +Summary: tomoe development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} +# for %{_datadir}/gtk-doc/html +Requires: gtk-doc %description devel The tomoe-devel package includes the header files for the tomoe package. @@ -29,13 +39,17 @@ Install this package if you want to develop programs which use tomoe. %build -%configure --disable-static +%configure --disable-static --enable-gtk-doc make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT +%if !%{ruby_binding} +rm -f $RPM_BUILD_ROOT%{_prefix}/lib/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/* +%endif + # remove .la files find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm @@ -56,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* +%{_libdir}/python2.5/site-packages/tomoe.so %{_libdir}/tomoe %{_datadir}/tomoe %dir %{_sysconfdir}/tomoe @@ -68,13 +83,23 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/tomoe %{_libdir}/pkgconfig/tomoe.pc %{_datadir}/gtk-doc/html/tomoe - +%{_libdir}/pkgconfig/pytomoe.pc +%if %{ruby_binding} +%{_prefix}/lib/ruby/site_ruby/1.8/tomoe.rb +%{_libdir}/ruby/site_ruby/1.8/*-linux/* +%endif %changelog +* Mon Jul 16 2007 Jens Petersen - 0.6.0-2 +- enable python binding with buildrequires pygtk2-codegen +- buildrequire gtk-doc +- require gtk-doc for devel package +- add a build switch for ruby binding + * Fri Jun 29 2007 Jens Petersen - 0.6.0-1 - update to 0.6.0 - tomoe-modules-noversion.patch no longer needed -- buildrequire perl-XML-Parser for intltool and python +- buildrequire gettext, python, and perl-XML-Parser (for intltool) * Thu Feb 15 2007 Jens Petersen - 0.5.1-1 - update to 0.5.1 From fe12478f41bc4b399def073563059ec56e533df4 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2007 03:55:33 +0000 Subject: [PATCH 18/90] - add python binding build switch - buildrequire pygobject2-devel --- tomoe.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index 1cb3eae..262cca4 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -1,3 +1,4 @@ +%define python_binding 1 %define ruby_binding 0 Name: tomoe @@ -12,6 +13,9 @@ Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.t BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel, gettext, gtk-doc BuildRequires: perl(XML::Parser), python, pygtk2-codegen +%if %{python_binding} +BuildRequires: pygobject2-devel, pygtk2-codegen +%endif %if %{ruby_binding} BuildRequires: ruby-glib2-devel %endif @@ -70,7 +74,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* +%if {python_binding} %{_libdir}/python2.5/site-packages/tomoe.so +%endif %{_libdir}/tomoe %{_datadir}/tomoe %dir %{_sysconfdir}/tomoe @@ -91,10 +97,11 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 16 2007 Jens Petersen - 0.6.0-2 -- enable python binding with buildrequires pygtk2-codegen +- add a build switch for python binding +- buildrequires for pygobject2-devel pygtk2-codegen - buildrequire gtk-doc - require gtk-doc for devel package -- add a build switch for ruby binding +- add a build switch for ruby binding (default off) * Fri Jun 29 2007 Jens Petersen - 0.6.0-1 - update to 0.6.0 From 405b1e14d4c54eeb28f7e473be128a95a4eb788d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2007 03:57:22 +0000 Subject: [PATCH 19/90] quote python_binding properly --- tomoe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 262cca4..a8869c3 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* -%if {python_binding} +%if %{python_binding} %{_libdir}/python2.5/site-packages/tomoe.so %endif %{_libdir}/tomoe From cad0efafd062124185d5564aa47e047d27e881ad Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 16 Jul 2007 04:40:43 +0000 Subject: [PATCH 20/90] buildrequire python-devel too --- tomoe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index a8869c3..eb84314 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel, gettext, gtk-doc BuildRequires: perl(XML::Parser), python, pygtk2-codegen %if %{python_binding} -BuildRequires: pygobject2-devel, pygtk2-codegen +BuildRequires: pygobject2-devel, python-devel, pygtk2-codegen %endif %if %{ruby_binding} BuildRequires: ruby-glib2-devel @@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 16 2007 Jens Petersen - 0.6.0-2 - add a build switch for python binding -- buildrequires for pygobject2-devel pygtk2-codegen +- buildrequires for pygobject2-devel, python-devel, and pygtk2-codegen - buildrequire gtk-doc - require gtk-doc for devel package - add a build switch for ruby binding (default off) From 9a9bca47bb30beebb7cbe525a4962f66a5cd5134 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Aug 2007 05:40:04 +0000 Subject: [PATCH 21/90] - Rebuild for selinux ppc32 issue. --- tomoe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index eb84314..77a7482 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,7 +3,7 @@ Name: tomoe Version: 0.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Aug 29 2007 Fedora Release Engineering - 0.6.0-3 +- Rebuild for selinux ppc32 issue. + * Mon Jul 16 2007 Jens Petersen - 0.6.0-2 - add a build switch for python binding - buildrequires for pygobject2-devel, python-devel, and pygtk2-codegen From d389b1a60e349f1fa692fc2b641e0d507db0c57f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 23:08:59 +0000 Subject: [PATCH 22/90] - Autorebuild for GCC 4.3 --- tomoe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 77a7482..0e8ccbd 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,7 +3,7 @@ Name: tomoe Version: 0.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-4 +- Autorebuild for GCC 4.3 + * Wed Aug 29 2007 Fedora Release Engineering - 0.6.0-3 - Rebuild for selinux ppc32 issue. From 04e8684a4c69e26288f908ec9ba3770cae1832b2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 27 Feb 2008 09:08:03 +0000 Subject: [PATCH 23/90] update license field from LGPL to LGPL2+ --- tomoe.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index 0e8ccbd..3908c08 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,13 +3,13 @@ Name: tomoe Version: 0.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries -License: LGPL +License: LGPL2+ URL: http://scim-imengine.sourceforge.jp/ -Source0: http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel, gettext, gtk-doc BuildRequires: perl(XML::Parser), python, pygtk2-codegen @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 27 2008 Jens Petersen - 0.6.0-4 +- update license field from LGPL to LGPL2+ + * Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-4 - Autorebuild for GCC 4.3 From b80f931fdd8f825f36155d0fc33ee6d27d5c7ff5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 27 Feb 2008 09:10:59 +0000 Subject: [PATCH 24/90] bump changelog nvr --- tomoe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 3908c08..cee22b4 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -96,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Feb 27 2008 Jens Petersen - 0.6.0-4 +* Wed Feb 27 2008 Jens Petersen - 0.6.0-5 - update license field from LGPL to LGPL2+ * Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-4 From f8c707b54ba6ed51d133fc2e5f2f2f6396de3f40 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 8 Sep 2008 21:22:53 +0000 Subject: [PATCH 25/90] fix license tag --- tomoe.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index cee22b4..44241c0 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,11 +3,11 @@ Name: tomoe Version: 0.6.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries -License: LGPL2+ +License: LGPLv2+ URL: http://scim-imengine.sourceforge.jp/ Source0: http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 8 2008 Tom "spot" Callaway - 0.6.0-6 +- fix license tag + * Wed Feb 27 2008 Jens Petersen - 0.6.0-5 - update license field from LGPL to LGPL2+ From e7095992462c926db32d2911ac8557a059d12d25 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 17:21:20 +0000 Subject: [PATCH 26/90] Rebuild for Python 2.6 --- tomoe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tomoe.spec b/tomoe.spec index 44241c0..a8deafd 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,7 +3,7 @@ Name: tomoe Version: 0.6.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.6.0-7 +- Rebuild for Python 2.6 + * Mon Sep 8 2008 Tom "spot" Callaway - 0.6.0-6 - fix license tag From a4e84dd0d4e6dd9a06c95ef2341135538f0b5ffa Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sun, 30 Nov 2008 00:53:27 +0000 Subject: [PATCH 27/90] Fix locations for Python 2.6 --- tomoe.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomoe.spec b/tomoe.spec index a8deafd..fc3d0a6 100644 --- a/tomoe.spec +++ b/tomoe.spec @@ -3,7 +3,7 @@ Name: tomoe Version: 0.6.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Handwritten input system for Japanese and Chinese Group: System Environment/Libraries @@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html %{_libdir}/libtomoe.so.* %if %{python_binding} -%{_libdir}/python2.5/site-packages/tomoe.so +%{_libdir}/python?.?/site-packages/tomoe.so %endif %{_libdir}/tomoe %{_datadir}/tomoe @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.6.0-8 +- Fix locations for Python 2.6 + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.6.0-7 - Rebuild for Python 2.6 From acd4bd681aa92b5c00ea72742568c8e0032a7571 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Sat, 17 Jan 2009 12:46:00 +0000 Subject: [PATCH 28/90] Bug 343321 --- import.log | 1 + tomoe-0.6.0-multiarch-conflict.patch | 44 ++++++++++++++++++++++++++++ tomoe.spec | 24 ++++++++++----- 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 import.log create mode 100644 tomoe-0.6.0-multiarch-conflict.patch diff --git a/import.log b/import.log new file mode 100644 index 0000000..5143bba --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +tomoe-0_6_0-9_fc10:HEAD:tomoe-0.6.0-9.fc10.src.rpm:1232196134 diff --git a/tomoe-0.6.0-multiarch-conflict.patch b/tomoe-0.6.0-multiarch-conflict.patch new file mode 100644 index 0000000..6bd7788 --- /dev/null +++ b/tomoe-0.6.0-multiarch-conflict.patch @@ -0,0 +1,44 @@ +diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml +--- ./doc/reference/tomoe-docs.sgml.multiarch-conflict 2007-04-10 17:24:20.000000000 +1000 ++++ ./doc/reference/tomoe-docs.sgml 2009-01-16 17:54:20.000000000 +1000 +@@ -41,6 +41,7 @@ + + + ++ + Index + +