[aqbanking/f16] Fix up rpaths a little cleaner.

Thu Jan 19 17:27:27 UTC 2012

commit 68e7c5f206f41f2585d341ac8ca238b09f4d5aaa
Author: Bill Nottingham <notting at redhat.com>
Date:   Thu Jan 19 12:26:53 2012 -0500

    Fix up rpaths a little cleaner.

 aqbanking-5.0.22-conflict.patch |   45 ------------------------------------
 aqbanking-arch.patch            |   48 +++++++++++++++++++++++++++++++++++++++
 aqbanking.spec                  |    7 ++++-
 3 files changed, 53 insertions(+), 47 deletions(-)
---

diff --git a/aqbanking-5.0.22-conflict.patch b/aqbanking-5.0.22-conflict.patch
index 09cdb5c..838b0de 100644
--- a/aqbanking-5.0.22-conflict.patch
+++ b/aqbanking-5.0.22-conflict.patch
@@ -10,51 +10,6 @@ diff -up aqbanking-5.0.22/configure.conflict aqbanking-5.0.22/configure
  
  
  
-@@ -11978,7 +11978,7 @@ BEGIN {RS=" "; FS="/|\n";} {
-   esac
-   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
- else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+  sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib"
- fi
- library_names_spec=
- libname_spec='lib$name'
-@@ -11992,7 +11992,7 @@ shlibpath_var=
- 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"
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
-@@ -12450,7 +12450,7 @@ fi
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15843,7 +15843,7 @@ shlibpath_var=
- 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"
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
-@@ -16299,7 +16299,7 @@ fi
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
 @@ -19764,7 +19764,7 @@ esac
  # Output files
  #
diff --git a/aqbanking-arch.patch b/aqbanking-arch.patch
new file mode 100644
index 0000000..a1bf30d
--- /dev/null
+++ b/aqbanking-arch.patch
@@ -0,0 +1,48 @@
+diff -up aqbanking-5.0.22/configure.conflict aqbanking-5.0.22/configure
+--- aqbanking-5.0.22/configure.conflict	2012-01-09 13:45:45.000000000 -0500
++++ aqbanking-5.0.22/configure	2012-01-19 09:46:17.252162096 -0500
+@@ -11978,7 +11978,7 @@ BEGIN {RS=" "; FS="/|\n";} {
+   esac
+   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+ else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib"
+ fi
+ library_names_spec=
+ libname_spec='lib$name'
+@@ -11992,7 +11992,7 @@ shlibpath_var=
+ 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"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -12450,7 +12450,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -15843,7 +15843,7 @@ shlibpath_var=
+ 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"
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+ 
+@@ -16299,7 +16299,7 @@ fi
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/aqbanking.spec b/aqbanking.spec
index e9a27e1..7821021 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -3,7 +3,7 @@
 Name: aqbanking
 Summary: A library for online banking functions and financial data import/export
 Version: 5.0.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php
 # aqbanking contains nonfree code that we cannot ship.  Therefore we use
 # this script to remove the nonfree code before shipping it.
@@ -16,6 +16,7 @@ License: GPLv2 or GPLv3
 URL: http://www.aquamaniac.de/aqbanking/
 Patch2: aqbanking-5.0.2-pkgconfig.patch
 Patch3: aqbanking-5.0.22-conflict.patch
+Patch4: aqbanking-arch.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gwenhywfar-devel >= 4.0.0, gmp-devel, gettext, libtool
 Obsoletes: aqhbci <= 1.0.3
@@ -58,6 +59,7 @@ compiling programs using Aqbanking.
 
 # hack to nuke rpaths, slighly less ugly than using overriding LIBTOOL below
 %if "%{_libdir}" != "/usr/lib"
+%patch4 -p1 -b .arch
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %endif
 
@@ -135,8 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aqbanking/typemaker2
 
 %changelog
-* Thu Jan 19 2012 Bill Nottingham <notting at redhat.com> - 5.0.22-1
+* Thu Jan 19 2012 Bill Nottingham <notting at redhat.com> - 5.0.22-2
 - update to 5.0.22
+- fix up rpaths a little cleaner
 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
