rpms/scim-m17n/F-7 scim-m17n.spec,1.12,1.13
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Wed Jul 4 08:39:16 UTC 2007
Author: petersen
Update of /cvs/extras/rpms/scim-m17n/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4777
Modified Files:
scim-m17n.spec
Log Message:
remove with_libstdc_preview macro
Index: scim-m17n.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-m17n/F-7/scim-m17n.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scim-m17n.spec 24 Oct 2006 03:48:01 -0000 1.12
+++ scim-m17n.spec 4 Jul 2007 08:38:40 -0000 1.13
@@ -1,5 +1,3 @@
-%define with_libstdc_preview 0
-
Name: scim-m17n
Version: 0.2.1
Release: 1%{?dist}
@@ -12,9 +10,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildrequires: scim-devel, m17n-lib-devel
Obsoletes: iiimf-le-unit <= 1:12.2
-%if %{with_libstdc_preview}
-Buildrequires: libstdc++so7-devel
-%endif
Requires: scim >= 1.4.4
Patch1: scim-m17n-no-M17N-prefix.patch
Patch2: scim-m17n-US-keyboard-211266.patch
@@ -31,22 +26,12 @@
%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\.. /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/*/IMEngine/m17n.la
@@ -64,6 +49,9 @@
%changelog
+* Wed Jul 4 2007 Jens Petersen <petersen at redhat.com> - 0.2.1-1
+- remove with_libstdc_preview macro
+
* Tue Oct 24 2006 Jens Petersen <petersen at redhat.com> - 0.2.1-1
- update to 0.2.1 release
- scim-m17n-0.2.0-unique-uuid.patch no longer needed
More information about the scm-commits
mailing list