rpms/scim-tomoe/FC-6 scim-tomoe-libexecdir.patch, NONE, 1.1 scim-tomoe.spec, 1.15, 1.16

[Jens Petersen (petersen)]

Author: petersen

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

Modified Files:
	scim-tomoe.spec 
Added Files:
	scim-tomoe-libexecdir.patch 
Log Message:
(test new cvs-import.sh)
- add scim-tomoe-libexecdir.patch to make scim-tomoe wrapper script run
  (#227626)


scim-tomoe-libexecdir.patch:

--- NEW FILE scim-tomoe-libexecdir.patch ---
--- scim-tomoe-0.5.0/configure.ac~	2006-12-18 17:39:43.000000000 +1000
+++ scim-tomoe-0.5.0/configure.ac	2007-02-07 15:30:49.000000000 +1000
@@ -101,7 +101,7 @@
 SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
 SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
 SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
-SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
+SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`/..
 
 if test "x$SCIM_DATADIR" = "x"; then
   SCIM_DATADIR=${datadir}/scim


Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/FC-6/scim-tomoe.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-tomoe.spec	21 Jan 2007 06:43:56 -0000	1.15
+++ scim-tomoe.spec	2 Apr 2007 03:24:01 -0000	1.16
@@ -2,7 +2,7 @@
 
 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,21 +11,25 @@
 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
 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
@@ -53,7 +57,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
 
 
 %files -f %{name}.lang
@@ -65,6 +69,10 @@
 
 
 %changelog
+* 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)
+
 * Sun Jan 21 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.0-2
 - fix the building dependency.