Author: petersen
Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171
Modified Files:
scim-input-pad.spec
Log Message:
- run autoconf for scim-input-pad-libexecdir.patch
- remove %%with_libstdc_preview
Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-input-pad.spec 16 Sep 2006 15:52:34 -0000 1.8
+++ scim-input-pad.spec 1 Nov 2006 02:50:42 -0000 1.9
@@ -1,8 +1,6 @@
-%define with_libstdc_preview 0
-
Name: scim-input-pad
Version: 0.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: On-screen Input Pad for SCIM
Group: System Environment/Libraries
@@ -15,9 +13,8 @@
Patch1: scim-input-pad-libexecdir.patch
BuildRequires: scim-devel
-%if %{with_libstdc_preview}
-Buildrequires: libstdc++so7-devel
-%endif
+# patch1 touches configure.ac
+BuildRequires: autoconf
Requires: scim
%description
@@ -27,25 +24,16 @@
%setup -q
%patch0 -p0 -b .0-rpath
%patch1 -p1 -b .1-libexec
-
+# patch1 touches configure.ac
+autoconf
%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 ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/Helper/input-pad.la
@@ -75,6 +63,10 @@
%changelog
+* Wed Nov 1 2006 Jens Petersen <petersen(a)redhat.com> - 0.1.1-7
+- run autoconf for scim-input-pad-libexecdir.patch
+- remove %%with_libstdc_preview
+
* Sun Sep 17 2006 Ryo Dairiki <ryo-dairiki(a)users.sourceforge.net> - 0.1.1-6
- mass rebuilding