rpms/scim-tomoe/devel scim-tomoe.spec,1.15,1.16

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-tomoe.spec 
Log Message:
- add scim-tomoe-libexecdir.patch to make scim-tomoe wrapper script run
Resolves: #227626
- remove %%with_libstdc_preview



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-tomoe.spec	21 Jan 2007 07:28:05 -0000	1.15
+++ scim-tomoe.spec	7 Feb 2007 06:38:20 -0000	1.16
@@ -1,8 +1,6 @@
-%define with_libstdc_preview 0
-
 Name:           scim-tomoe
 Version:        0.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -11,41 +9,34 @@
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         scim-tomoe-moduledir.patch
+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}
 
-Patch0: scim-tomoe-moduledir.patch
-
 %description
 Scim-tomoe allows Japanese handwritten input of characters using SCIM.
 
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .0-moduledir
+%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
-%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
 
@@ -53,7 +44,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 
 %files -f %{name}.lang
@@ -65,6 +56,11 @@
 
 
 %changelog
+* Wed Feb  7 2007 Jens Petersen <petersen at redhat.com> - 0.5.0-3
+- 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.