diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-08-04 17:24:55 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-08-04 17:24:55 +0200 |
| commit | 9528e91a715876e9e37e10d141069ea80da55820 (patch) | |
| tree | 59c90957ea00c412b1d39d330da933cb04edb034 | |
| parent | 41ab3915d6e6ef97009c07af3de351a102568f40 (diff) | |
php-nette-application: fix autoloader
| -rw-r--r-- | php-nette-application-dev.spec | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/php-nette-application-dev.spec b/php-nette-application-dev.spec index 512941d..a20f0a6 100644 --- a/php-nette-application-dev.spec +++ b/php-nette-application-dev.spec @@ -18,7 +18,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.4.1 -%global specrel 1 +%global specrel 2 Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Nette Application MVC Component @@ -116,7 +116,6 @@ foreach (array( '%{php_home}/%{ns_vendor}/ComponentModel/autoload.php' => true, '%{php_home}/%{ns_vendor}/Http/autoload.php' => true, '%{php_home}/%{ns_vendor}/Reflection/autoload.php' => true, - '%{php_home}/%{ns_vendor}/Security/autoload.php' => true, '%{php_home}/%{ns_vendor}/Utils/autoload.php' => true, // Optional '%{php_home}/%{ns_vendor}/Forms/autoload.php' => false, @@ -143,8 +142,6 @@ rm tests/Bridges.DI/ApplicationExtension.scan.phpt rm tests/Application/MicroPresenter.response.phpt %endif -: Generate configuration -cat /etc/php.ini /etc/php.d/*ini >php.ini export LANG=fr_FR.utf8 : Generate autoloader @@ -154,27 +151,24 @@ cat << 'EOF' | tee vendor/autoload.php require_once '%{php_home}/Tester/autoload.php'; require_once '%{php_home}/%{ns_vendor}/DI/autoload.php'; require_once '%{php_home}/%{ns_vendor}/RobotLoader/autoload.php'; +require_once '%{php_home}/%{ns_vendor}/Security/autoload.php'; require_once '%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php'; EOF : Run test suite in sources tree -# remirepo:15 +# remirepo:11 run=0 ret=0 if which php56; then - cat /opt/remi/php56/root/etc/php.ini /opt/remi/php56/root/etc/php.d/*ini >php.ini - echo 'session.save_path = "/tmp"' >>php.ini - php56 %{_bindir}/nette-tester --colors 0 -p php56 -c ./php.ini tests -s + php56 %{_bindir}/nette-tester --colors 0 -p php56 -C tests -s run=1 fi if which php70; then - cat /etc/opt/remi/php70/php.ini /etc/opt/remi/php70/php.d/*ini >php.ini - echo 'session.save_path = "/tmp"' >>php.ini - php70 %{_bindir}/nette-tester --colors 0 -p php70 -c ./php.ini tests -s + php70 %{_bindir}/nette-tester --colors 0 -p php70 -C tests -s run=1 fi if [ $run -eq 0 ]; then -%{_bindir}/nette-tester --colors 0 -p php -c ./php.ini tests -s +%{_bindir}/nette-tester --colors 0 -p php -C tests -s # remirepo:2 fi exit $ret @@ -198,6 +192,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-2 +- fix autoloader + * Thu Aug 4 2016 Remi Collet <remi@fedoraproject.org> - 2.4.1-1 - update to 2.4.1 - raise dependency on PHP >= 5.6 |