switch to fedora/autoloaderHEADmaster

1 files changed, 29 insertions, 15 deletions

diff --git a/apigen.spec b/apigen.spec
index bbaf795..0198504 100644
--- a/apigen.spec
+++ b/apigen.spec
@@ -17,7 +17,7 @@
 
 Name:           %{c_project}
 Version:        4.1.2
-%global specrel 3
+%global specrel 4
 Release:        %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        PHP source code API generator
 
@@ -32,26 +32,40 @@ Source1:        makesrc.sh
 # and drop Herrera dependencies (only used for phar selfupdate command)
 Patch0:         %{name}-rpm.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php-composer(phpunit/phpunit)
 BuildRequires:  php(language) >= 5.4
+BuildRequires:  php-composer(nette/application) <  3
 BuildRequires:  php-composer(nette/application) >= 2.2
+BuildRequires:  php-composer(nette/bootstrap) <  3
 BuildRequires:  php-composer(nette/bootstrap) >= 2.2
+BuildRequires:  php-composer(nette/di) <  3
 BuildRequires:  php-composer(nette/di) >= 2.2
+BuildRequires:  php-composer(nette/neon) <  3
 BuildRequires:  php-composer(nette/neon) >= 2.2
+BuildRequires:  php-composer(nette/mail) <  3
 BuildRequires:  php-composer(nette/mail) >= 2.2
+BuildRequires:  php-composer(nette/robot-loader) <  3
 BuildRequires:  php-composer(nette/robot-loader) >= 2.2
+BuildRequires:  php-composer(nette/safe-stream) <  3
 BuildRequires:  php-composer(nette/safe-stream) >= 2.2
+BuildRequires:  php-composer(latte/latte) <  3
 BuildRequires:  php-composer(latte/latte) >= 2.2
+BuildRequires:  php-composer(tracy/tracy) <  3
 BuildRequires:  php-composer(tracy/tracy) >= 2.2
+BuildRequires:  php-composer(kukulich/fshl) <  3
 BuildRequires:  php-composer(kukulich/fshl) >= 2.1
+BuildRequires:  php-composer(andrewsville/php-token-reflection) <  2
 BuildRequires:  php-composer(andrewsville/php-token-reflection) >= 1.4
+BuildRequires:  php-composer(michelf/php-markdown) <  2
 BuildRequires:  php-composer(michelf/php-markdown) >= 1.4
 BuildRequires:  php-composer(kdyby/events) >= 2.0
+BuildRequires:  php-composer(symfony/options-resolver) <  3
 BuildRequires:  php-composer(symfony/options-resolver) >= 2.6.1
+BuildRequires:  php-composer(symfony/console) <  3
 BuildRequires:  php-composer(symfony/console) >= 2.6
+BuildRequires:  php-composer(symfony/yaml) <  3
 BuildRequires:  php-composer(symfony/yaml) >= 2.6
 BuildRequires:  php-composer(apigen/theme-default) >= 1.0.1
 BuildRequires:  php-composer(apigen/theme-bootstrap) >= 1.1.2
@@ -62,7 +76,7 @@ BuildRequires:  php-spl
 BuildRequires:  php-tokenizer
 BuildRequires:  php-zip
 # Autoloader
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader)
 # from composer.json, "require-dev": {
 #        "mockery/mockery": "~0.9",
 #        "herrera-io/box": "~1.6"
@@ -138,7 +152,7 @@ Requires:       php-spl
 Requires:       php-tokenizer
 Requires:       php-zip
 # Autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
 
 # composer name
 Provides:       php-composer(%{c_project}/%{c_project}) = %{version}
@@ -172,7 +186,6 @@ fi
 
 
 %install
-rm -rf     %{buildroot}
 mkdir -p   %{buildroot}%{_datadir}/php
 cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}
 
@@ -185,23 +198,21 @@ rm tests/Templating/Filters/Helpers/LinkBuilderTest.php
 rm tests/DI/ApiGenExtensionTest.php
 
 sed -e 's:@BUILDROOT@:%{buildroot}:' -i tests/bootstrap.php
-: Run test suite
-%{_bindir}/phpunit --verbose
 
-if which php70; then
-  php70 %{_bindir}/phpunit --verbose
-fi
+# PHP 7.2: PHP Fatal error:  Exception in Nette\Bridges\ApplicationLatte\Template::__toString(): Unknown macro {}, did you mean {l}? in ...
+
+: Run test suite
+for cmd in php php56 php70 php71; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit --verbose
+  fi
+done
 %else
 : Test suite disabled
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -211,6 +222,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 16 2017 Remi Collet <remi@fedoraproject.org> - 4.1.2-4
+- switch to fedora/autoloader
+
 * Thu Aug  4 2016 Remi Collet <remi@fedoraproject.org> - 4.1.2-3
 - ignore test failed because of deprecation messages
 - ignore kdyby/events max version