rpms/scim-tomoe/devel scim-tomoe.spec,1.2,1.3

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18797

Modified Files:
	scim-tomoe.spec 
Log Message:
- 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



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-tomoe.spec	7 Oct 2005 09:54:16 -0000	1.2
+++ scim-tomoe.spec	13 Feb 2006 06:42:32 -0000	1.3
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-tomoe
 Version:        0.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -9,8 +11,11 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:		scim
-BuildRequires:	scim-devel, tomoe-devel
+BuildRequires:  scim-devel, tomoe-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
+Requires:       scim
 
 %description
 Scim-tomoe allows Japanese handwritten input of characters using SCIM.
@@ -21,15 +26,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/*/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
 %find_lang %{name}
 
@@ -41,16 +56,22 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog
-%{_libdir}/scim-1.0
+%{_libdir}/scim-1.0/*/Helper/tomoe.so
+%{_libdir}/scim-1.0/*/SetupUI/tomoe-setup.so
 %{_datadir}/scim/icons/scim-tomoe.png
 
 
 %changelog
-* 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