rpms/scim/devel scim-1.4.5-no-rpath-libdir.patch, NONE, 1.1 scim.spec, 1.76, 1.77

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/scim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6458

Modified Files:
	scim.spec 
Added Files:
	scim-1.4.5-no-rpath-libdir.patch 
Log Message:
- add scim-1.4.5-no-rpath-libdir.patch to remove rpaths to libdir
- add noreplace to %config


scim-1.4.5-no-rpath-libdir.patch:
 src/Makefile.am   |    1 -
 utils/Makefile.am |    2 --
 2 files changed, 3 deletions(-)

--- NEW FILE scim-1.4.5-no-rpath-libdir.patch ---
--- scim-1.4.5/src/Makefile.am~	2007-02-12 17:34:48.000000000 +1000
+++ scim-1.4.5/src/Makefile.am	2007-03-09 13:01:46.000000000 +1000
@@ -130,7 +130,6 @@
 
 libscim_1_0_la_LDFLAGS	= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
 			  -export-dynamic \
-			  -rpath $(libdir) \
 			  $(LD_VERSION_SCRIPT_OPTION) \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @LIBICONV@ \
--- scim-1.4.5/utils/Makefile.am~	2005-07-10 23:45:40.000000000 +1000
+++ scim-1.4.5/utils/Makefile.am	2007-03-09 13:01:44.000000000 +1000
@@ -53,7 +53,6 @@
 
 libscim_gtkutils_1_0_la_LDFLAGS	= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
 				  -export-dynamic \
-				  -rpath $(libdir) \
 				  @LIBTOOL_EXPORT_OPTIONS@ \
 				  @LTLIBINTL@ \
 				  @GTK2_LIBS@ 
@@ -68,7 +67,6 @@
 
 libscim_x11utils_1_0_la_LDFLAGS	= -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
 				  -export-dynamic \
-				  -rpath $(libdir) \
 				  @LIBTOOL_EXPORT_OPTIONS@ \
 				  @LTLIBINTL@ \
 				  @X_LIBS@ 


Index: scim.spec
===================================================================
RCS file: /cvs/dist/rpms/scim/devel/scim.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- scim.spec	9 Mar 2007 02:42:24 -0000	1.76
+++ scim.spec	9 Mar 2007 03:19:55 -0000	1.77
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.5
-Release:   8%{?dist}
+Release:   9%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPL
@@ -43,6 +43,7 @@
 Patch14:   scim_x11_frontend-ic-focus-LTC27940-215953.patch
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch16:   scim_panel_gtk-settle-toolbar-after-drag.patch
+Patch17:   scim-1.4.5-no-rpath-libdir.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -109,11 +110,12 @@
 %patch14 -p1 -b .14-xim-focus
 %patch15 -p1 -b .15-key-snooper
 %patch16 -p1 -b .16-drag-move
+%patch17 -p1 -b .17-rpath
 
 %if %{snapshot}
 ./bootstrap
 %else
-# patch1 touches configure.ac and src/Makefile.am
+# patch1 and patch17 touch configure.ac and Makefile.am
 autoreconf
 %endif
 
@@ -219,7 +221,7 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-scim-setup.desktop
 %dir %{_xinputdir}
-%config %{_xinputconf}
+%config(noreplace) %{_xinputconf}
 
 %files devel
 %defattr(-,root,root,-)
@@ -249,6 +251,9 @@
 
 
 %changelog
+* Fri Mar  9 2007 Jens Petersen <petersen at redhat.com>
+- rpmlint cleanup (#226395)
+
 * Mon Feb 12 2007 Jens Petersen <petersen at redhat.com> - 1.4.5-8
 - separate gtk immodule out to a separate subpackage
 - update icons with improvements by Andy Fitzsimon