switch from zend-loader to fedora/autoloader

1 files changed, 41 insertions, 28 deletions

diff --git a/php-zendframework-zend-xmlrpc.spec b/php-zendframework-zend-xmlrpc.spec
index e6974c2..bbd291d 100644
--- a/php-zendframework-zend-xmlrpc.spec
+++ b/php-zendframework-zend-xmlrpc.spec
@@ -21,7 +21,7 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        2.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -42,18 +42,18 @@ BuildRequires:  php-libxml
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-xmlwriter
-BuildRequires:  php-composer(%{gh_owner}/zend-http)             >= 2.5.4
-BuildRequires:  php-composer(%{gh_owner}/zend-math)             >= 2.7
-BuildRequires:  php-composer(%{gh_owner}/zend-server)           >= 2.7
-BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
-BuildRequires:  php-composer(%{gh_owner}/zendxml)               >= 1.0.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-http)           >= 2.5.4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-math)           >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-server)         >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zendxml)             >= 1.0.2
 # From composer, "require-dev": {
 #        "phpunit/PHPUnit": "^4.8",
 #        "squizlabs/php_codesniffer": "^2.3.1"
 BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.8
-# Autoloader
-BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
+# Autoloader
+BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
@@ -64,22 +64,24 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 #        "zendframework/zendxml": "^1.0.2"
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-composer(%{gh_owner}/zend-http)             >= 2.5.4
-Requires:       php-composer(%{gh_owner}/zend-http)             <  3
-Requires:       php-composer(%{gh_owner}/zend-math)             >= 2.7
-Requires:       php-composer(%{gh_owner}/zend-math)             <  4
-Requires:       php-composer(%{gh_owner}/zend-server)           >= 2.7
-Requires:       php-composer(%{gh_owner}/zend-server)           <  3
-Requires:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
-Requires:       php-composer(%{gh_owner}/zend-stdlib)           <  4
-Requires:       php-composer(%{gh_owner}/zendxml)               >= 1.0.2
-Requires:       php-composer(%{gh_owner}/zendxml)               <  2
+Requires:       php-autoloader(%{gh_owner}/zend-http)           >= 2.5.4
+Requires:       php-autoloader(%{gh_owner}/zend-http)           <  3
+Requires:       php-autoloader(%{gh_owner}/zend-math)           >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-math)           <  4
+Requires:       php-autoloader(%{gh_owner}/zend-server)         >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-server)         <  3
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+Requires:       php-autoloader(%{gh_owner}/zendxml)             >= 1.0.2
+Requires:       php-autoloader(%{gh_owner}/zendxml)             <  2
 # From composer, "suggest": {
 #        "zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"
 %if 0%{?fedora} >= 21
-Suggests:       php-composer(%{gh_owner}/zend-cache)
+Suggests:       php-autoloader(%{gh_owner}/zend-cache)
 %endif
 %endif
+# Autoloader
+Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 2.5.2
 Requires:       php-simplexml
 Requires:       php-date
@@ -93,6 +95,7 @@ Requires:       php-xmlwriter
 Obsoletes:      php-ZendFramework2-%{library} < 2.5
 Provides:       php-ZendFramework2-%{library} = %{version}
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
+Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
 
 
 %description
@@ -114,7 +117,20 @@ mv LICENSE.md LICENSE
 
 
 %build
-# Empty build section, nothing required
+: Generate autoloader
+phpab --template fedora --output src/autoload.php src
+cat << 'EOF' | tee -a src/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/Zend/Http/autoload.php',
+    '%{php_home}/Zend/Math/autoload.php',
+    '%{php_home}/Zend/Server/autoload.php',
+    '%{php_home}/Zend/Stdlib/autoload.php',
+    '%{php_home}/ZendXml/autoload.php',
+]);
+\Fedora\Autoloader\Dependencies::optional([
+    '%{php_home}/Zend/Cache/autoload.php',
+]);
+EOF
 
 
 %install
@@ -127,14 +143,8 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
-require_once '%{php_home}/Zend/Loader/AutoloaderFactory.php';
-Zend\Loader\AutoloaderFactory::factory(array(
-    'Zend\Loader\StandardAutoloader' => array(
-        'namespaces' => array(
-           'ZendTest\\%{library}' => dirname(__DIR__).'/test/',
-           'Zend\\%{library}'     => '%{buildroot}%{php_home}/Zend/%{library}'
-))));
-require_once '%{php_home}/Zend/autoload.php';
+require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
 require_once 'test/TestAsset/functions.php';
 EOF
 
@@ -159,6 +169,9 @@ exit $ret
 
 
 %changelog
+* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.6.1-2
+- switch from zend-loader to fedora/autoloader
+
 * Fri Aug 11 2017 Remi Collet <remi@remirepo.net> - 2.6.1-1
 - Update to 2.6.1