From f698e40c7d5f88a2fefe66687a3f5656b478f4dc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 20 Dec 2017 18:25:40 +0100
Subject: drop autoloader from SCL packages

---
 php-pear.spec | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/php-pear.spec b/php-pear.spec
index 45068c9..619fcb2 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.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
 # Structures_Graph is LGPLv3+
@@ -72,7 +72,9 @@ BuildRequires: %{?scl_prefix}php-devel
 %if %{with_tests}
 BuildRequires:  %{_bindir}/phpunit
 %endif
+%if 0%{?!scl:1}
 BuildRequires:  php-fedora-autoloader-devel
+%endif
 
 # Temporary
 %{?scl:Obsoletes: %{scl_prefix}fakepear}
@@ -85,15 +87,17 @@ Provides:  %{?scl_prefix}php-pear(XML_Util) = %{xmlutil}
 Provides:  %{?scl_prefix}php-pear(PEAR_Manpages) = %{manpages}
 
 Provides:  %{?scl_prefix}php-composer(pear/console_getopt)   = %{getoptver}
-Provides:  %{?scl_prefix}php-autoloader(pear/console_getopt) = %{getoptver}
 Provides:  %{?scl_prefix}php-composer(pear/archive_tar)   = %{arctarver}
-Provides:  %{?scl_prefix}php-autoloader(pear/archive_tar) = %{arctarver}
 Provides:  %{?scl_prefix}php-composer(pear/pear-core-minimal)   = %{version}
-Provides:  %{?scl_prefix}php-autoloader(pear/pear-core-minimal) = %{version}
 Provides:  %{?scl_prefix}php-composer(pear/structures_graph)   = %{structver}
-Provides:  %{?scl_prefix}php-autoloader(pear/structures_graph) = %{structver}
 Provides:  %{?scl_prefix}php-composer(pear/xml_util)   = %{xmlutil}
+%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}
+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
@@ -140,7 +144,9 @@ Requires: httpd-filesystem
 %else
 %global with_html_dir 1
 %endif
+%if 0%{?!scl:1}
 Requires: php-composer(fedora/autoloader)
+%endif
 
 
 %description
@@ -180,6 +186,7 @@ sed -e 's/@SCL@/%{?scl:%{scl}_}/' \
 
 
 %build
+%if 0%{?!scl:1}
 # Create per package autoloader
 phpab --template fedora \
       --output PEAR/autoload.php\
@@ -203,6 +210,7 @@ mkdir XML/Util
 phpab --template fedora \
       --output XML/Util/autoload.php \
       XML
+%endif
 
 
 %install
@@ -283,10 +291,12 @@ install -m 755 -d %{buildroot}%{_root_bindir}
 ln -s %{_bindir}/pear      %{buildroot}%{_root_bindir}/%{scl_prefix}pear
 %endif
 
+%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
 done
+%endif
 
 
 %check
@@ -452,6 +462,9 @@ fi
 
 
 %changelog
+* Tue Dec 19 2017 Remi Collet <remi@remirepo.net> - 1:1.10.5-5
+- drop autoloader from SCL packages
+
 * Tue Dec 19 2017 Remi Collet <remi@remirepo.net> - 1:1.10.5-4
 - add autoloader for each package
 
-- 
cgit