From b3d7bb90abe6b62943f82535bedb6908d267ac02 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 25 Jun 2020 16:46:34 +0200
Subject: switch to classmap autoloader add missing dependency on
 fedora/autoloader

---
 php-nikic-php-parser4.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 0e94423..830e7bb 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -22,7 +22,7 @@
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
 Version:        4.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
@@ -56,7 +56,7 @@ BuildRequires:  phpunit8
 BuildRequires:  phpunit6 >= 6.5
 %endif
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-fedora-autoloader-devel
 %endif
 
 # From composer.json, "require": {
@@ -72,7 +72,7 @@ Requires:       php-pcre
 Requires:       php-spl
 Requires:       php-cli
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_owner}/%{pk_project}) = %{version}
 
@@ -96,13 +96,9 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
 
 %build
 : Generate an simple PSR-4 autoloader
-cat << 'AUTOLOAD' | tee lib/%{ns_project}/autoload.php
-<?php
-/* Autoloader for %{name} and its dependencies */
-require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', __DIR__);
-AUTOLOAD
+phpab --template fedora \
+      --output lib/%{ns_project}/autoload.php \
+      lib/%{ns_project}
 
 
 %install
@@ -157,6 +153,10 @@ exit $ret
 
 
 %changelog
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 4.5.0-2
+- switch to classmap autoloader
+- add missing dependency on fedora/autoloader
+
 * Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 4.5.0-1
 - update to 4.5.0
 
-- 
cgit