rpms/scim-tomoe/FC-4 scim-tomoe.spec,1.5,1.6 sources,1.3,1.4

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim-tomoe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7451

Modified Files:
	scim-tomoe.spec sources 
Log Message:
update to 0.4.0


Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-tomoe.spec	2 Mar 2006 02:19:08 -0000	1.5
+++ scim-tomoe.spec	24 Dec 2006 03:15:02 -0000	1.6
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 0
+
 Name:           scim-tomoe
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -9,10 +11,13 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: scim-tomoe-moduledir.patch
+BuildRequires:  scim-devel, tomoe-devel, libtomoe-gtk-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
+Requires:       scim
 
-Requires:		scim
-BuildRequires:	scim-devel, tomoe-devel, libtomoe-gtk-devel
+Patch0: scim-tomoe-moduledir.patch
 
 %description
 Scim-tomoe allows Japanese handwritten input of characters using SCIM.
@@ -24,15 +29,25 @@
 
 
 %build
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 %configure --disable-static
+%if %{with_libstdc_preview}
+# tweak libtool for libstdc++-so7
+sed -i -e "s/4.1.0 /4.2.0-`grep datestamp= %{_bindir}/g++-libstdc++-so_7 | sed -e "s/datestamp=//"` /" libtool
+%endif
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
 %find_lang %{name}
 
@@ -43,20 +58,37 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/scim-1.0/*/Helper/tomoe.so
 %{_datadir}/scim/icons/scim-tomoe.png
 
 
 %changelog
+* Thu Dec 21 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.4.0-1
+- update to 0.4.0.
+
+* Fri Oct 7 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-6
+- fix the release number for upgrading install from FE5 to FE6.
+
+* Sat Sep 15 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2.0-5
+- mass rebuilding.
+
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-4
+- rebuild without libstdc++so7
+
 * Wed Mar  1 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2-3
 - update to 0.2
 
-* Fri Oct  7 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1-2
+* Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.1.0-3
+- build conditionally with libstdc++so7 preview library (#166041)
+  - add with_libstdc_preview switch and tweak libtool to link against it
+- list shared object module files explicitly
+
+* Fri Oct  7 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1.0-2
 - add scim into the requirement
 
-* Wed Aug 31 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 0.1-1
-- update to 0.1
+* Wed Aug 31 2005 Ryo Dairiki <ryo-dairiki at mbm.nifty.com> - 0.1.0-1
+- update to 0.1.0
 
 * Wed Aug 17 2005 Jens Petersen <petersen at redhat.com> - 0.0.0-0.20050817
 - initial packaging of cvs snapshot


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Mar 2006 06:03:51 -0000	1.3
+++ sources	24 Dec 2006 03:15:02 -0000	1.4
@@ -1 +1 @@
-55bc028af137ed5f99bab4ca042219cf  scim-tomoe-0.2.0.tar.gz
+55bed4f803dea070052956c293e4b07f  scim-tomoe-0.4.0.tar.gz