[php53-mapi/el5] Add forgotten patch as well

[Robert Scheck]

commit a8a1ffb0bf7877431d65a693dad22e4954b367e3
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 13 03:37:16 2012 +0200

    Add forgotten patch as well

 php53-mapi.spec                                    |    2 +-
 ...-6.40.5-rpath.patch => zarafa-7.0.9-rpath.patch |   52 ++++---------------
 2 files changed, 12 insertions(+), 42 deletions(-)
---
diff --git a/php53-mapi.spec b/php53-mapi.spec
index 25a5b9e..c31fa71 100644
--- a/php53-mapi.spec
+++ b/php53-mapi.spec
@@ -25,7 +25,7 @@ Source0:            http://download.zarafa.com/community/final/7.0/%{version}-%{
 %endif
 Source1:            zarafa.ini
 
-Patch0:             zarafa-6.40.5-rpath.patch
+Patch0:             zarafa-7.0.9-rpath.patch
 
 BuildRequires:      bison
 BuildRequires:      gcc-c++
diff --git a/zarafa-6.40.5-rpath.patch b/zarafa-7.0.9-rpath.patch
similarity index 66%
rename from zarafa-6.40.5-rpath.patch
rename to zarafa-7.0.9-rpath.patch
index b39097c..47c5c3b 100644
--- a/zarafa-6.40.5-rpath.patch
+++ b/zarafa-7.0.9-rpath.patch
@@ -1,4 +1,4 @@
-Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 6.40.5, which works
+Patch by Robert Scheck <robert at fedoraproject.org> for zarafa >= 7.0.9, which works
 around the broken libtool of Debian. Multilib/multiarch systems like Fedora or Red
 Hat Enterprise Linux are using /usr/lib64 for 64 bit libraries and /usr/lib is used
 for 32 bit libraries. That allows to run 32 bit software on 64 bit systems. Debian
@@ -34,9 +34,9 @@ More information regarding this topic can be found for example at:
  - http://lists.gnu.org/archive/html/libtool/2009-01/msg00039.html
  - http://thread.gmane.org/gmane.comp.gnu.libtool.general/8339/focus=8345
 
---- zarafa-6.40.5/aclocal.m4			2011-01-24 13:06:08.000000000 +0100
-+++ zarafa-6.40.5/aclocal.m4.rpath		2011-02-27 14:00:53.371489885 +0100
-@@ -1708,10 +1708,13 @@
+--- zarafa-7.0.9/aclocal.m4			2012-08-03 13:58:18.000000000 +0200
++++ zarafa-7.0.9/aclocal.m4.rpath		2012-08-12 22:57:31.000000000 +0200
+@@ -2485,10 +2485,13 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -45,15 +45,15 @@ More information regarding this topic can be found for example at:
 +
    # 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;/^$/d' | tr '\n' ' '`
+     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;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
---- zarafa-6.40.5/configure			2011-01-24 13:06:11.000000000 +0100
-+++ zarafa-6.40.5/configure.rpath		2011-02-27 14:00:35.902552604 +0100
-@@ -9614,10 +9614,13 @@
+--- zarafa-7.0.9/configure			2012-08-03 13:58:18.000000000 +0200
++++ zarafa-7.0.9/configure.rpath		2012-08-12 22:59:05.000000000 +0200
+@@ -10097,10 +10097,13 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -62,13 +62,13 @@ More information regarding this topic can be found for example at:
 +
    # 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;/^$/d' | tr '\n' ' '`
+     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;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -13592,10 +13595,13 @@
+@@ -15288,10 +15291,13 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -77,37 +77,7 @@ More information regarding this topic can be found for example at:
 +
    # 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;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -16226,10 +16232,13 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # 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;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18860,10 +18869,13 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Add ABI-specific directories to the system library path.
-+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-+
-   # 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;/^$/d' | tr '\n' ' '`
+     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;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
    fi