From f385b66f3bafae813ffdc8f31c418627e05e374a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Jun 28 2017 04:46:49 +0000 Subject: update PEAR to 1.10.5 (no change) --- diff --git a/.gitignore b/.gitignore index 7db2ada..483cddc 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /PEAR-1.10.3.tgz /PEAR-1.10.4.tgz /Archive_Tar-1.4.3.tgz +/PEAR-1.10.5.tgz diff --git a/php-pear.spec b/php-pear.spec index e0e2541..25d8e87 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -26,8 +26,8 @@ Summary: PHP Extension and Application Repository framework Name: php-pear -Version: 1.10.4 -Release: 2%{?dist} +Version: 1.10.5 +Release: 1%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -141,13 +141,13 @@ export PHP_PEAR_INSTALL_DIR=%{peardir} export PHP_PEAR_CACHE_DIR=${PWD}%{_localstatedir}/cache/php-pear export PHP_PEAR_TEMP_DIR=/var/tmp -install -d $RPM_BUILD_ROOT%{peardir} \ - $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \ - $RPM_BUILD_ROOT%{_localstatedir}/www/html \ - $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml \ - $RPM_BUILD_ROOT%{_sysconfdir}/pear +install -d %{buildroot}%{peardir} \ + %{buildroot}%{_localstatedir}/cache/php-pear \ + %{buildroot}%{_localstatedir}/www/html \ + %{buildroot}%{_localstatedir}/lib/pear/pkgxml \ + %{buildroot}%{_sysconfdir}/pear -export INSTALL_ROOT=$RPM_BUILD_ROOT +export INSTALL_ROOT=%{buildroot} %{_bindir}/php --version @@ -167,62 +167,62 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} # Replace /usr/bin/* with simple scripts: -install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pear -install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_bindir}/pecl -install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_bindir}/peardev +install -m 755 %{SOURCE10} %{buildroot}%{_bindir}/pear +install -m 755 %{SOURCE11} %{buildroot}%{_bindir}/pecl +install -m 755 %{SOURCE12} %{buildroot}%{_bindir}/peardev # Sanitize the pear.conf -%{_bindir}/php %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf %{_datadir} +%{_bindir}/php %{SOURCE3} %{buildroot}%{_sysconfdir}/pear.conf %{_datadir} # Display configuration for debug -%{_bindir}/php -r "print_r(unserialize(substr(file_get_contents('$RPM_BUILD_ROOT%{_sysconfdir}/pear.conf'),17)));" +%{_bindir}/php -r "print_r(unserialize(substr(file_get_contents('%{buildroot}%{_sysconfdir}/pear.conf'),17)));" install -m 644 -D macros.pear \ - $RPM_BUILD_ROOT%{macrosdir}/macros.pear + %{buildroot}%{macrosdir}/macros.pear # apply patches on installed PEAR tree -pushd $RPM_BUILD_ROOT%{peardir} +pushd %{buildroot}%{peardir} : no patch \\o/ popd # Why this file here ? -rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap +rm -rf %{buildroot}/.depdb* %{buildroot}/.lock %{buildroot}/.channels %{buildroot}/.filemap # Need for re-registrying XML_Util -install -m 644 *.xml $RPM_BUILD_ROOT%{_localstatedir}/lib/pear/pkgxml +install -m 644 *.xml %{buildroot}%{_localstatedir}/lib/pear/pkgxml %check # Check that no bogus paths are left in the configuration, or in # the generated registry files. -grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 -grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 -grep '"/tmp"' $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 -grep /usr/local $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1 -grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1 +grep %{buildroot} %{buildroot}%{_sysconfdir}/pear.conf && exit 1 +grep %{_libdir} %{buildroot}%{_sysconfdir}/pear.conf && exit 1 +grep '"/tmp"' %{buildroot}%{_sysconfdir}/pear.conf && exit 1 +grep /usr/local %{buildroot}%{_sysconfdir}/pear.conf && exit 1 +grep -rl %{buildroot} %{buildroot} && exit 1 %if %{with_tests} cp /etc/php.ini . -echo "include_path=.:$RPM_BUILD_ROOT%{peardir}:/usr/share/php" >>php.ini +echo "include_path=.:%{buildroot}%{peardir}:/usr/share/php" >>php.ini export PHPRC=$PWD/php.ini LOG=$PWD/rpmlog ret=0 -cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Structures_Graph/tests +cd %{buildroot}%{_datadir}/tests/pear/Structures_Graph/tests phpunit \ AllTests || ret=1 -cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/XML_Util/tests +cd %{buildroot}%{_datadir}/tests/pear/XML_Util/tests %{_bindir}/php \ - $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \ + %{buildroot}/usr/share/pear/pearcmd.php \ run-tests \ | tee $LOG -cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Console_Getopt/tests +cd %{buildroot}%{_datadir}/tests/pear/Console_Getopt/tests %{_bindir}/php \ - $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \ + %{buildroot}/usr/share/pear/pearcmd.php \ run-tests \ | tee -a $LOG @@ -290,6 +290,9 @@ fi %changelog +* Wed Jun 28 2017 Remi Collet 1:1.10.5-1 +- update PEAR to 1.10.5 (no change) + * Mon Jun 12 2017 Remi Collet 1:1.10.4-2 - update Archive_Tar to 1.4.3 diff --git a/sources b/sources index c5dc13b..1be162f 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (Archive_Tar-1.4.3.tgz) = 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd -SHA512 (PEAR-1.10.4.tgz) = 6c191eef1ab20522485c7709af748f48b34397c4e1c3618aecfb5489c168cec43111588cf717fcc6ead18f220ad723457cbd62289bd67e614fab089c4b88f3b3 +SHA512 (PEAR-1.10.5.tgz) = c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364 SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833 SHA512 (Structures_Graph-1.1.1.tgz) = cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284 SHA512 (XML_Util-1.4.2.tgz) = e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe