diff options
| -rw-r--r-- | php-pear.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/php-pear.spec b/php-pear.spec index 4a11f9e..f3df1fc 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.7 -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} && 0%{?rhel} < 8 +%if 0%{?!scl:1} 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} && 0%{?rhel} < 8 +%if 0%{?!scl:1} 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} @@ -145,7 +145,7 @@ Requires: httpd-filesystem %else %global with_html_dir 1 %endif -%if 0%{?!scl:1} && 0%{?rhel} < 8 +%if 0%{?!scl:1} Requires: php-composer(fedora/autoloader) %endif @@ -187,7 +187,7 @@ sed -e 's/@SCL@/%{?scl:%{scl}_}/' \ %build -%if 0%{?!scl:1} && 0%{?rhel} < 8 +%if 0%{?!scl:1} # Create per package autoloader phpab --template fedora \ --output PEAR/autoload.php\ @@ -292,7 +292,7 @@ install -m 755 -d %{buildroot}%{_root_bindir} ln -s %{_bindir}/pear %{buildroot}%{_root_bindir}/%{scl_prefix}pear %endif -%if 0%{?!scl:1 && 0%{?rhel} < 8} +%if 0%{?!scl:1} # 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 @@ -463,6 +463,9 @@ fi %changelog +* Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-2 +- EL-8 build with autoloader + * Thu Dec 6 2018 Remi Collet <remi@remirepo.net> - 1:1.10.7-1 - update PEAR to 1.10.7 |