rpms/scim-input-pad/devel scim-input-pad.spec,1.4,1.5

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18588

Modified Files:
	scim-input-pad.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-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-input-pad.spec	12 Feb 2006 00:13:51 -0000	1.4
+++ scim-input-pad.spec	13 Feb 2006 06:21:12 -0000	1.5
@@ -1,6 +1,8 @@
+%define with_libstdc_preview 1 
+
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -12,6 +14,9 @@
 Patch0:         scim-input-pad-rpath.patch
 
 BuildRequires:  scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
 Requires:       scim
 
 %description
@@ -23,16 +28,26 @@
 
 
 %build
+%if %{with_libstdc_preview}
+export CXX=%{_bindir}/g++-libstdc++-so_7
+%endif
 %configure --disable-static --disable-rpath
+%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 DESTDIR=${RPM_BUILD_ROOT} install
 
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la
+rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -52,13 +67,17 @@
 %doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
-%{_libdir}/scim-1.0/Helper/input-pad.so
+%{_libdir}/scim-1.0/*/Helper/input-pad.so
 %{_datadir}/scim/icons/input-pad.png
-%dir %{_datadir}/scim/input-pad/
-%{_datadir}/scim/input-pad/*
+%{_datadir}/scim/input-pad
 
 
 %changelog
+* Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.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
+
 * Sun Feb 12 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1.1-2
 - a little cleanup