rpms/lirc/devel lirc-0.8.0-rpath64.patch, NONE, 1.1 lirc.spec, 1.14, 1.15

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24023

Modified Files:
	lirc.spec 
Added Files:
	lirc-0.8.0-rpath64.patch 
Log Message:
* Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-3
- Avoid standard rpaths on lib64 archs.


lirc-0.8.0-rpath64.patch:

--- NEW FILE lirc-0.8.0-rpath64.patch ---
--- lirc-0.8.0/configure~	2006-01-21 11:03:45.000000000 +0200
+++ lirc-0.8.0/configure	2006-02-14 22:19:00.000000000 +0200
@@ -4282,7 +4282,7 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 case $host_os in
--- lirc-0.8.0/aclocal.m4~	2006-01-21 11:03:43.000000000 +0200
+++ lirc-0.8.0/aclocal.m4	2006-02-14 22:19:11.000000000 +0200
@@ -2531,7 +2531,7 @@
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 
 case $host_os in


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lirc.spec	21 Jan 2006 15:13:25 -0000	1.14
+++ lirc.spec	14 Feb 2006 20:29:59 -0000	1.15
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -52,9 +53,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-touch -r aclocal.m4 configure.in # avoid autofoo re-run
+touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
 
 
 %build
@@ -138,6 +140,9 @@
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-3
+- Avoid standard rpaths on lib64 archs.
+
 * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
 - 0.8.0.