rpms/scim-input-pad/devel scim-input-pad-libexecdir.patch, NONE, 1.1 scim-input-pad.spec, 1.6, 1.7

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16513

Modified Files:
	scim-input-pad.spec 
Added Files:
	scim-input-pad-libexecdir.patch 
Log Message:
fix libexecdir in wrapper script for new module path


scim-input-pad-libexecdir.patch:

--- NEW FILE scim-input-pad-libexecdir.patch ---
--- scim-input-pad-0.1.1/configure.ac~	2005-12-06 12:06:26.000000000 +0900
+++ scim-input-pad-0.1.1/configure.ac	2006-08-04 15:28:59.000000000 +0900
@@ -84,7 +84,7 @@
 SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim`
 SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim`
 SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim`
-SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`
+SCIM_LIBEXECDIR=`$PKG_CONFIG --variable=moduledir scim`/..
 
 if test "x$SCIM_ICONDIR" = "x"; then
   SCIM_ICONDIR=${datadir}/scim/icons


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- scim-input-pad.spec	4 Apr 2006 13:10:08 -0000	1.6
+++ scim-input-pad.spec	4 Aug 2006 06:39:19 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         scim-input-pad-rpath.patch
+Patch1:         scim-input-pad-libexecdir.patch
 
 BuildRequires:  scim-devel
 %if %{with_libstdc_preview}
@@ -24,7 +25,8 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .0-rpath
+%patch1 -p1 -b .1-libexec
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Fri Aug  4 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-5
+- fix libexecdir in wrapper script for new module path
+
 * Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-4
 - rebuild without libstdc++so7