rpms/scim-tomoe/FC-6 scim-tomoe.spec,1.17,1.18

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-tomoe.spec 
Log Message:
remove with_libstdc_preview macro since fc5 is now eol



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/FC-6/scim-tomoe.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- scim-tomoe.spec	3 Apr 2007 01:20:09 -0000	1.17
+++ scim-tomoe.spec	4 Jul 2007 08:56:15 -0000	1.18
@@ -1,5 +1,3 @@
-%define with_libstdc_preview 0
-
 Name:           scim-tomoe
 Version:        0.5.0
 Release:        3%{?dist}
@@ -15,9 +13,6 @@
 Patch1:         scim-tomoe-libexecdir.patch
 
 BuildRequires:  scim-devel, tomoe-devel, libtomoe-gtk-devel
-%if %{with_libstdc_preview}
-Buildrequires:  libstdc++so7-devel
-%endif
 # patch1 touches configure.ac
 BuildRequires:  autoconf
 Requires:       scim, tomoe >= %{version}, libtomoe-gtk >= %{version}
@@ -35,23 +30,13 @@
 
 
 %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 -rf ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
@@ -74,6 +59,7 @@
 * Wed Feb  7 2007 Jens Petersen <petersen at redhat.com> - 0.5.0-3.fc6
 - add scim-tomoe-libexecdir.patch to make scim-tomoe wrapper script run
   (#227626)
+- remove %%with_libstdc_preview
 
 * Sun Jan 21 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.0-2
 - fix the building dependency.