diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | php-pear.spec | 167 |
2 files changed, 69 insertions, 100 deletions
@@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/php-pear.spec b/php-pear.spec index e8488be..5fa5448 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -20,16 +20,16 @@ %global metadir %{_localstatedir}/lib/pear %global getoptver 1.4.3 -%global arctarver 1.4.9 +%global arctarver 1.5.0 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address -%global structver 1.1.1 +%global structver 1.2.0 %global xmlutil 1.4.5 %global manpages 1.10.0 # Tests are only run with rpmbuild --with tests # Can't be run in mock / koji because PEAR is the first package -%global with_tests 0%{?_with_tests:1} +%bcond_with tests %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d) @@ -39,12 +39,13 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear -Version: 1.10.12 +Version: 1.10.16 Release: 1%{?dist} Epoch: 1 -# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD -# Structures_Graph is LGPLv3+ -License: BSD and LGPLv3+ +# BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt +# BSD-3-Clause: XML_Util +# LGPL-3.0-or-later: Structures_Graph +License: BSD-2-Clause AND BSD-3-Clause AND LGPL-3.0-or-later URL: http://pear.php.net/package/PEAR Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz # wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php @@ -68,8 +69,8 @@ BuildRequires: %{?scl_prefix}php-xml BuildRequires: %{_root_bindir}/gpg # For pecl_xmldir macro BuildRequires: %{?scl_prefix}php-devel -%if %{with_tests} -BuildRequires: %{_bindir}/phpunit +%if %{with tests} +BuildRequires: %{_bindir}/phpunit7 %endif %if 0%{?!scl:1} BuildRequires: php-fedora-autoloader-devel @@ -98,26 +99,6 @@ Provides: %{?scl_prefix}php-autoloader(pear/structures_graph) = %{structver} Provides: %{?scl_prefix}php-autoloader(pear/xml_util) = %{xmlutil} %endif -%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# From other third party -Obsoletes: php53-pear <= %{epoch}:%{version} -Obsoletes: php53u-pear <= %{epoch}:%{version} -Obsoletes: php54-pear <= %{epoch}:%{version} -Obsoletes: php54w-pear <= %{epoch}:%{version} -Obsoletes: php55u-pear <= %{epoch}:%{version} -Obsoletes: php55w-pear <= %{epoch}:%{version} -Obsoletes: php56u-pear <= %{epoch}:%{version} -Obsoletes: php56w-pear <= %{epoch}:%{version} -Obsoletes: php70u-pear <= %{epoch}:%{version} -Obsoletes: php70w-pear <= %{epoch}:%{version} -Obsoletes: php71u-pear <= %{epoch}:%{version} -Obsoletes: pear1u <= %{epoch}:%{version} -Obsoletes: pear1 <= %{epoch}:%{version} -Obsoletes: php71w-pear <= %{epoch}:%{version} -Obsoletes: php72w-pear <= %{epoch}:%{version} -%endif - -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}} # Archive_Tar requires 5.2 # XML_Util, Structures_Graph require 5.3 # Console_Getopt requires 5.4 @@ -138,7 +119,7 @@ Requires: %{?scl_prefix}php-bz2 # Structures_Graph: none # XML_Util: pcre # optional: overload and xdebug -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 && 0%{!?scl:1} +%if 0%{!?scl:1} %global with_html_dir 0 # for /var/www/html ownership Requires: httpd-filesystem @@ -146,7 +127,7 @@ Requires: httpd-filesystem %global with_html_dir 1 %endif %if 0%{?!scl:1} -Requires: php-composer(fedora/autoloader) +Recommends: php-composer(fedora/autoloader) %endif @@ -230,10 +211,6 @@ install -d %{buildroot}%{peardir} \ %{buildroot}%{_localstatedir}/cache/php-pear \ %{buildroot}%{_localstatedir}/www/html \ %{buildroot}%{_localstatedir}/lib/pear/pkgxml \ -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 - %{buildroot}%{_docdir}/pecl \ - %{buildroot}%{_datadir}/tests/pecl \ -%endif %{buildroot}%{_sysconfdir}/pear export INSTALL_ROOT=%{buildroot} @@ -277,11 +254,11 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -: no patch + : none popd # Why this file here ? -rm -rf %{buildroot}/.depdb* %{buildroot}/.lock %{buildroot}/.channels $RPM_BUILD_ROOT/.filemap +rm -rf %{buildroot}/.depdb* %{buildroot}/.lock %{buildroot}/.channels %{buildroot}/.filemap # Need for re-registrying XML_Util install -pm 644 *.xml %{buildroot}%{_localstatedir}/lib/pear/pkgxml @@ -310,7 +287,7 @@ grep /usr/local %{buildroot}%{_sysconfdir}/pear.conf && exit 1 grep -rl %{buildroot} %{buildroot} && exit 1 -%if %{with_tests} +%if %{with tests} cp /etc/php.ini . echo "include_path=.:%{buildroot}%{peardir}:/usr/share/php" >>php.ini export PHPRC=$PWD/php.ini @@ -318,11 +295,12 @@ LOG=$PWD/rpmlog ret=0 cd %{buildroot}%{_datadir}/tests/pear/Structures_Graph/tests -phpunit \ - AllTests || ret=1 +phpunit7 \ + --include-path=%{buildroot}%{_datadir}/pear \ + . || ret=1 cd %{buildroot}%{_datadir}/tests/pear/XML_Util/tests -phpunit \ +phpunit7 \ --bootstrap=/usr/share/pear/XML/Util/autoload.php \ --test-suffix .php . || ret=1 @@ -340,7 +318,6 @@ echo 'Test suite disabled (missing "--with tests" option)' %endif -%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 # Register newly installed PECL packages %transfiletriggerin -- %{pecl_xmldir} while read file; do @@ -362,57 +339,6 @@ while ($file=fgets(STDIN)) { }' | while read name; do %{_bindir}/pecl uninstall --nodeps --ignore-errors --register-only "$name" >/dev/null || : done -%endif - - -%if 0%{?fedora} < 25 && 0%{?rhel} < 8 -%pre -# Manage relocation of metadata, before update to pear -if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then - mkdir -p %{metadir} - mv -f %{peardir}/.??* %{metadir} -fi - - -%post -# force new value as pear.conf is (noreplace) -current=$(%{_bindir}/pear config-get test_dir system) -if [ "$current" != "%{_datadir}/tests/pear" ]; then -%{_bindir}/pear config-set \ - test_dir %{_datadir}/tests/pear \ - system >/dev/null || : -fi - -current=$(%{_bindir}/pear config-get data_dir system) -if [ "$current" != "%{_datadir}/pear-data" ]; then -%{_bindir}/pear config-set \ - data_dir %{_datadir}/pear-data \ - system >/dev/null || : -fi - -current=$(%{_bindir}/pear config-get metadata_dir system) -if [ "$current" != "%{metadir}" ]; then -%{_bindir}/pear config-set \ - metadata_dir %{metadir} \ - system >/dev/null || : -fi - -current=$(%{_bindir}/pear config-get -c pecl doc_dir system) -if [ "$current" != "%{_docdir}/pecl" ]; then -%{_bindir}/pear config-set \ - -c pecl \ - doc_dir %{_docdir}/pecl \ - system >/dev/null || : -fi - -current=$(%{_bindir}/pear config-get -c pecl test_dir system) -if [ "$current" != "%{_datadir}/tests/pecl" ]; then -%{_bindir}/pear config-set \ - -c pecl \ - test_dir %{_datadir}/tests/pecl \ - system >/dev/null || : -fi -%endif %postun @@ -444,11 +370,6 @@ fi %doc README* %dir %{_docdir}/pear %doc %{_docdir}/pear/* -%if 0%{?fedora} < 24 && 0%{?rhel} < 8 -%dir %{_docdir}/pecl -%dir %{_datadir}/tests -%dir %{_datadir}/tests/pecl -%endif %{_datadir}/tests/pear %{_datadir}/pear-data %if 0%{?scl:1} @@ -462,12 +383,58 @@ fi %changelog -* Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1 +* Mon Nov 25 2024 Remi Collet <remi@remirepo.net> - 1.10.16-1 +- update to 1.10.16 + +* Tue Mar 19 2024 Remi Collet <remi@remirepo.net> - 1.10.15-3 +- update Structures_Graph to 1.2.0 (no change) + +* Tue Mar 19 2024 Remi Collet <remi@remirepo.net> - 1.10.15-2 +- update Archive_Tar to 1.5.0 + +* Mon Mar 11 2024 Remi Collet <remi@remirepo.net> - 1.10.15-1 +- update to 1.10.15 + +* Mon Nov 27 2023 Remi Collet <remi@remirepo.net> - 1.10.14-1 +- update to 1.10.14 +- drop patches merged upstream + +* Thu Nov 23 2023 Remi Collet <remi@remirepo.net> - 1.10.13-7 +- fix more deprecations from + https://github.com/pear/pear-core/pull/127 + +* Mon Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.10.13-5 +- fix PHP 8.2 deprecations using patch from + https://github.com/pear/pear-core/pull/124 +- use SPDX license IDs + +* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 1.10.13-1 +- update to 1.10.13 + +* Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-9 +- update Archive_Tar to 1.4.14 + +* Fri Jun 18 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-8 +- fedora/autoloader is optional + +* Mon May 10 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-7 +- update Archive_Tar to 1.4.13 + +* Tue Jan 19 2021 Remi Collet <remi@remirepo.net> - 1:1.10.12-5 +- update Archive_Tar to 1.4.12 + +* Mon Nov 23 2020 Remi Collet <remi@remirepo.net> - 1:1.10.12-4 +- update Archive_Tar to 1.4.11 + +* Wed Sep 16 2020 Remi Collet <remi@remirepo.net> - 1:1.10.12-2 +- update Archive_Tar to 1.4.10 + +* Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 1:1.10.12-1 - update PEAR to 1.10.12 - update XML_Util to 1.4.5 - drop patch merged upstream -* Sat Apr 11 2020 Remi Collet <remi@remirepo.net> - 1.10.11-1 +* Sat Apr 11 2020 Remi Collet <remi@remirepo.net> - 1:1.10.11-1 - update to 1.10.11 - drop patch merged upstream |