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

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-fcitx.spec 
Log Message:
- build conditionally with libstdc++so7 preview library (#166041)
  - add with_libstdc_preview switch and tweak libtool to link against it
- update filelist since moduledir is now api-versioned



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scim-fcitx.spec	27 Dec 2005 03:16:11 -0000	1.2
+++ scim-fcitx.spec	13 Feb 2006 05:53:43 -0000	1.3
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
@@ -10,6 +12,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
 Requires:	scim
 
 %description
@@ -30,16 +35,26 @@
 
 
 %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
 # doesn't build with %{?_smp_mflags}
 make
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/IMEngine/fcitx.la
+rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
 
 
 %clean
@@ -49,7 +64,7 @@
 %files
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING README ChangeLog
-%{_libdir}/scim-1.0/IMEngine/fcitx.so
+%{_libdir}/scim-1.0/*/IMEngine/fcitx.so
 %{_datadir}/scim/fcitx
 %{_datadir}/scim/icons/fcitx
 
@@ -60,6 +75,11 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-3
+- build conditionally with libstdc++so7 preview library (#166041)
+  - add with_libstdc_preview switch and tweak libtool to link against it
+- update filelist since moduledir is now api-versioned
+
 * Tue Dec 20 2005 Jens Petersen <petersen at redhat.com> - 3.1.1-2
 - package cleanup (John Mahowald)