From c3a0c1a83c861b463c47e437cca43c05b9e139e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 14 Feb 2006 20:29:59 +0000 Subject: [PATCH] - Avoid standard rpaths on lib64 archs. --- lirc-0.8.0-rpath64.patch | 22 ++++++++++++++++++++++ lirc.spec | 9 +++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 lirc-0.8.0-rpath64.patch diff --git a/lirc-0.8.0-rpath64.patch b/lirc-0.8.0-rpath64.patch new file mode 100644 index 0000000..b0ecfeb --- /dev/null +++ b/lirc-0.8.0-rpath64.patch @@ -0,0 +1,22 @@ +--- 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 diff --git a/lirc.spec b/lirc.spec index 6745cf2..e99481b 100644 --- a/lirc.spec +++ b/lirc.spec @@ -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 @@ Source0: http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2 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 @@ Requires: %{name} = %{version}-%{release} %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 @@ fi %changelog +* Tue Feb 14 2006 Ville Skyttä - 0.8.0-3 +- Avoid standard rpaths on lib64 archs. + * Sat Jan 21 2006 Ville Skyttä - 0.8.0-2 - 0.8.0.