rpms/scim-input-pad/FC-3 scim-input-pad-rpath.patch, NONE, 1.1 scim-input-pad.spec, 1.3, 1.4

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim-input-pad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13625

Modified Files:
	scim-input-pad.spec 
Added Files:
	scim-input-pad-rpath.patch 
Log Message:
a little cleanup

scim-input-pad-rpath.patch:

--- NEW FILE scim-input-pad-rpath.patch ---
--- m4/lib-link.m4.old	2006-02-12 08:56:53.108198906 +0900
+++ m4/lib-link.m4	2006-02-12 09:01:02.770589904 +0900
@@ -114,9 +114,9 @@
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
+  AC_ARG_ENABLE(enable-rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
+    [enable_rpath=$enableval], [enable_rpath=yes])
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and


Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/FC-3/scim-input-pad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scim-input-pad.spec	23 Dec 2005 10:17:50 -0000	1.3
+++ scim-input-pad.spec	12 Feb 2006 00:39:06 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         scim-input-pad-rpath.patch
+
 BuildRequires:  scim-devel
 Requires:       scim
 
@@ -17,10 +19,11 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
 
@@ -28,8 +31,8 @@
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
-rm ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/Helper/input-pad.la
+rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libscim-input-pad.{la,so}
 
 %find_lang %{name}
 
@@ -46,7 +49,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README ChangeLog
+%doc COPYING README ChangeLog
 %{_bindir}/scim-input-pad
 %{_libdir}/libscim-input-pad.so.*
 %{_libdir}/scim-1.0/Helper/input-pad.so
@@ -56,7 +59,10 @@
 
 
 %changelog
-* Fri Dec 23 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net>
+* Sun Feb 12 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1.1-2
+- a little cleanup
+
+* Fri Dec 23 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.1.1-1
 - update to 0.1.1
 - get rid of the patch for irregal casting