From d4c33ac6eb8608105aa12d0203ba54483b04bdf2 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 09:59:39 +0100 Subject: [PATCH] fix php libdir path for x86_64 [release 1.9.4-2mamba;Sun Jun 15 2014] --- pear.sh | 4 ++-- peardev.sh | 4 ++-- pecl.sh | 4 ++-- php-pear.spec | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pear.sh b/pear.sh index 7dddd92..a8e5d19 100644 --- a/pear.sh +++ b/pear.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/php -C -d include_path=/usr/lib/php \ - -d output_buffering=1 /usr/lib/php/pearcmd.php "$@" +exec /usr/bin/php -C -d include_path=@LIBDIR@/php \ + -d output_buffering=1 @LIBDIR@/php/pearcmd.php "$@" diff --git a/peardev.sh b/peardev.sh index cc6168b..1806a48 100644 --- a/peardev.sh +++ b/peardev.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/php -d memory_limit="-1" -C -q -d include_path=/usr/lib/php \ - -d output_buffering=1 /usr/lib/php/pearcmd.php "$@" +exec /usr/bin/php -d memory_limit="-1" -C -q -d include_path=@LIBDIR@/php \ + -d output_buffering=1 @LIBDIR@/php/pearcmd.php "$@" diff --git a/pecl.sh b/pecl.sh index 2f6a9d9..f167b45 100644 --- a/pecl.sh +++ b/pecl.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/php -C -n -q -d include_path=/usr/lib/php \ - -d output_buffering=1 /usr/lib/php/peclcmd.php "$@" +exec /usr/bin/php -C -n -q -d include_path=@LIBDIR@/php \ + -d output_buffering=1 @LIBDIR@/php/peclcmd.php "$@" diff --git a/php-pear.spec b/php-pear.spec index eb9b3c6..c0deaa3 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -8,7 +8,7 @@ %define xml_util_version 1.2.1 Name: php-pear Version: 1.9.4 -Release: 1mamba +Release: 2mamba Summary: PHP Extension and Application Repository framework Group: Development/Languages Vendor: openmamba @@ -99,6 +99,11 @@ install -D -m 755 %{SOURCE10} %{buildroot}%{_bindir}/pear install -m 755 %{SOURCE11} %{buildroot}%{_bindir}/pecl install -m 755 %{SOURCE12} %{buildroot}%{_bindir}/peardev +sed -i "s|@LIBDIR@|%{_libdir}|g" \ + %{buildroot}%{_bindir}/pear \ + %{buildroot}%{_bindir}/pecl \ + %{buildroot}%{_bindir}/peardev + # Sanitize the pear.conf %{_bindir}/php %{SOURCE3} %{buildroot}%{_sysconfdir}/php/pear.conf ext_dir >new-pear.conf %{_bindir}/php %{SOURCE3} new-pear.conf http_proxy > %{buildroot}%{_sysconfdir}/php/pear.conf @@ -173,6 +178,9 @@ rm new-pear.conf #README* %changelog +* Sun Jun 15 2014 Silvan Calarco 1.9.4-2mamba +- fix php libdir path for x86_64 + * Mon Mar 18 2013 Silvan Calarco 1.9.4-1mamba - update to 1.9.4