rpms/scim-skk/devel scim-skk.spec,1.10,1.11

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-skk.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-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- scim-skk.spec	12 Feb 2006 01:03:16 -0000	1.10
+++ scim-skk.spec	13 Feb 2006 06:31:14 -0000	1.11
@@ -1,6 +1,8 @@
-Name:	    scim-skk
+%define with_libstdc_preview 1 
+
+Name:		scim-skk
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -9,8 +11,11 @@
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:		scim skkdic
 BuildRequires:	scim-devel
+%if %{with_libstdc_preview}
+Buildrequires:  libstdc++so7-devel
+%endif
+Requires:	scim, skkdic
 
 %description
 Scim-skk is a SCIM IMEngine module for skk to support Japanese input
@@ -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 DESTDIR=${RPM_BUILD_ROOT} install
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
 
 %find_lang %{name}
 
@@ -41,15 +56,18 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
-%dir %{_libdir}/scim-1.0/IMEngine
-%{_libdir}/scim-1.0/IMEngine/skk.so
-%dir %{_libdir}/scim-1.0/SetupUI
-%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so
-%{_datadir}/scim/icons/scim-skk.png
+%{_libdir}/scim-1.0/*/IMEngine/skk.so
+%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so
 %{_datadir}/scim/icons/scim-skk.png
 
 
 %changelog
+* Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-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.5.2-2
 - a little cleanup