diff options
| -rw-r--r-- | php-pear.spec | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/php-pear.spec b/php-pear.spec index 90e86eb..07b42ef 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -40,7 +40,7 @@ Summary: PHP Extension and Application Repository framework Name: %{?scl_prefix}php-pear Version: 1.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -72,7 +72,7 @@ BuildRequires: %{?scl_prefix}php-devel %if %{with_tests} BuildRequires: %{_bindir}/phpunit %endif -%if 0%{?!scl:1} +%if 0%{?!scl:1} && 0%{?rhel} < 8 BuildRequires: php-fedora-autoloader-devel %endif @@ -91,7 +91,7 @@ Provides: %{?scl_prefix}php-composer(pear/archive_tar) = %{arctarver} Provides: %{?scl_prefix}php-composer(pear/pear-core-minimal) = %{version} Provides: %{?scl_prefix}php-composer(pear/structures_graph) = %{structver} Provides: %{?scl_prefix}php-composer(pear/xml_util) = %{xmlutil} -%if 0%{?!scl:1} +%if 0%{?!scl:1} && 0%{?rhel} < 8 Provides: %{?scl_prefix}php-autoloader(pear/console_getopt) = %{getoptver} Provides: %{?scl_prefix}php-autoloader(pear/archive_tar) = %{arctarver} Provides: %{?scl_prefix}php-autoloader(pear/pear-core-minimal) = %{version} @@ -137,14 +137,14 @@ Requires: %{?scl_prefix}php-bz2 # Structures_Graph: none # XML_Util: pcre # optional: overload and xdebug -%if 0%{?fedora} >= 21 && 0%{!?scl:1} +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 && 0%{!?scl:1} %global with_html_dir 0 # for /var/www/html ownership Requires: httpd-filesystem %else %global with_html_dir 1 %endif -%if 0%{?!scl:1} +%if 0%{?!scl:1} && 0%{?rhel} < 8 Requires: php-composer(fedora/autoloader) %endif @@ -178,7 +178,7 @@ sed -e 's/@SCL@/%{?scl:%{scl}_}/' \ -e 's:@BINDIR@:%{_bindir}:' \ -e 's:@ETCDIR@:%{_sysconfdir}:' \ -e 's:@PREFIX@:%{_prefix}:' \ -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 %{SOURCE14} | tee macros.pear %else %{SOURCE13} | tee macros.pear @@ -186,7 +186,7 @@ sed -e 's/@SCL@/%{?scl:%{scl}_}/' \ %build -%if 0%{?!scl:1} +%if 0%{?!scl:1} && 0%{?rhel} < 8 # Create per package autoloader phpab --template fedora \ --output PEAR/autoload.php\ @@ -229,7 +229,7 @@ install -d %{buildroot}%{peardir} \ %{buildroot}%{_localstatedir}/cache/php-pear \ %{buildroot}%{_localstatedir}/www/html \ %{buildroot}%{_localstatedir}/lib/pear/pkgxml \ -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 %{buildroot}%{_docdir}/pecl \ %{buildroot}%{_datadir}/tests/pecl \ %endif @@ -291,7 +291,7 @@ install -m 755 -d %{buildroot}%{_root_bindir} ln -s %{_bindir}/pear %{buildroot}%{_root_bindir}/%{scl_prefix}pear %endif -%if 0%{?!scl:1} +%if 0%{?!scl:1 && 0%{?rhel} < 8} # install autoloaders for i in PEAR/autoload.php Structures/Graph/autoload.php Archive/Tar/autoload.php Console/Getopt/autoload.php XML/Util/autoload.php do install -Dpm 644 $i %{buildroot}%{peardir}/$i @@ -340,7 +340,7 @@ echo 'Test suite disabled (missing "--with tests" option)' %endif -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 # Register newly installed PECL packages %transfiletriggerin -- %{pecl_xmldir} while read file; do @@ -365,7 +365,7 @@ done %endif -%if 0%{?fedora} < 25 +%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 @@ -444,7 +444,7 @@ fi %doc README* %dir %{_docdir}/pear %doc %{_docdir}/pear/* -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 %dir %{_docdir}/pecl %dir %{_datadir}/tests %dir %{_datadir}/tests/pecl @@ -462,6 +462,9 @@ fi %changelog +* Fri Nov 30 2018 Remi Collet <remi@remirepo.net> - 1:1.10.6-2 +- EL-8 build + * Thu Aug 23 2018 Remi Collet <remi@remirepo.net> - 1:1.10.6-1 - update PEAR to 1.10.6 |