From 82b5d580b03a7a7ef09c7e75f60f4dcf0daea8fe Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Mon, 13 Mar 2017 15:33:29 -0400 Subject: [PATCH] Update to 1.0.0 - Test with SCLs if available --- .gitignore | 1 + php-fedora-autoloader.spec | 36 ++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e205574..c12679a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-fedora-autoloader-0.1.2-35f7b52f4682276620369bc4bc1a3a5fef93faad.tar.gz /php-fedora-autoloader-0.2.0-acadcf9f2511ac7b777117eb66728f95faabbe99.tar.gz /php-fedora-autoloader-0.2.1-98d5a2ec9389686eec8e185c1d0495ef1a6a75c3.tar.gz +/php-fedora-autoloader-1.0.0-a71e31e6342b74dd3a4816ac04a05e2a8560228c.tar.gz diff --git a/php-fedora-autoloader.spec b/php-fedora-autoloader.spec index 2f62ac7..e26b318 100644 --- a/php-fedora-autoloader.spec +++ b/php-fedora-autoloader.spec @@ -1,8 +1,8 @@ # # Fedora spec file for php-fedora-autoloader # -# Copyright (c) 2016 Shawn Iwinski -# Remi Collet +# Copyright (c) 2016-2017 Shawn Iwinski +# Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner php-fedora %global github_name autoloader -%global github_version 0.2.1 -%global github_commit 98d5a2ec9389686eec8e185c1d0495ef1a6a75c3 +%global github_version 1.0.0 +%global github_commit a71e31e6342b74dd3a4816ac04a05e2a8560228c %global composer_vendor fedora %global composer_project autoloader @@ -32,7 +32,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Fedora Autoloader Group: Development/Libraries @@ -49,13 +49,15 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver} BuildRequires: php-pear -## phpcompatinfo (computed from version 0.2.1) +## phpcompatinfo (computed from version 1.0.0) +BuildRequires: php-ctype BuildRequires: php-spl %endif # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 0.2.1) +# phpcompatinfo (computed from version 1.0.0) +Requires: php-ctype Requires: php-spl # Composer @@ -112,11 +114,17 @@ cp -p res/phpab/fedora.php.tpl %{buildroot}%{phpab_template_dir}/ %check %if %{with_tests} -%{_bindir}/php \ - -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \ - %{_bindir}/phpunit \ - --bootstrap %{buildroot}%{phpdir}/Fedora/Autoloader/autoload.php \ - --verbose +RETURN_CODE=0 +for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71; do + if which $PHP_EXEC; then + $PHP_EXEC \ + -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \ + %{_bindir}/phpunit \ + --bootstrap %{buildroot}%{phpdir}/Fedora/Autoloader/autoload.php \ + --verbose + fi +done +exit $RETURN_CODE %else : Tests skipped %endif @@ -135,6 +143,10 @@ cp -p res/phpab/fedora.php.tpl %{buildroot}%{phpab_template_dir}/ %changelog +* Mon Mar 13 2017 Shawn Iwinski - 1.0.0-1 +- Update to 1.0.0 +- Test with SCLs if available + * Sat Feb 11 2017 Fedora Release Engineering - 0.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 9e7d826..efabff2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c83cafdce843fa87bca8850ccf16a34 php-fedora-autoloader-0.2.1-98d5a2ec9389686eec8e185c1d0495ef1a6a75c3.tar.gz +SHA512 (php-fedora-autoloader-1.0.0-a71e31e6342b74dd3a4816ac04a05e2a8560228c.tar.gz) = f0ab072e455df4fbb666fc9876236aa84dae4ce918abdc301118b9550db06904fb579d02f3267c8c20890ab652e13f4f1a2b0cc806e343e8211f8123558ded66