rpms/scim-pinyin/F-7 scim-pinyin.spec,1.35,1.36
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Wed Jul 4 08:34:35 UTC 2007
Author: petersen
Update of /cvs/extras/rpms/scim-pinyin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv712
Modified Files:
scim-pinyin.spec
Log Message:
remove with_libstdc_preview macro
Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-pinyin/F-7/scim-pinyin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scim-pinyin.spec 23 Nov 2006 07:27:51 -0000 1.35
+++ scim-pinyin.spec 4 Jul 2007 08:33:57 -0000 1.36
@@ -1,5 +1,3 @@
-%define with_libstdc_preview 0
-
Name: scim-pinyin
Version: 0.5.91
Release: 16%{?dist}
@@ -12,9 +10,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scim-devel, gtk2-devel, gettext, gettext-devel, autoconf, automake,libtool
-%if %{with_libstdc_preview}
-Buildrequires: libstdc++so7-devel
-%endif
Requires: scim
Obsoletes: iiimf-le-chinput <= 0.3, miniChinput <= 0.0.3
Patch1: scim-pinyin-shuangpin.patch
@@ -36,24 +31,14 @@
%patch5 -p1 -b .5-translate
%build
-%if %{with_libstdc_preview}
-export CXX=%{_bindir}/g++-libstdc++-so_7
-%endif
./bootstrap
%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 -C po update-gmo
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 $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la
@@ -77,6 +62,9 @@
%changelog
+* Wed Jul 4 2007 Jens Petersen <petersen at redhat.com>
+- remove with_libstdc_preview macro
+
* Thu Nov 23 2006 Shawn Huang <phuang at redhat.com> - 0.5.91-16
- add Obsoletes: miniChinput <= 0.3 to remove miniChinput when upgrading
from RHEL4 (#211878).
More information about the scm-commits
mailing list