diff --git a/.gitignore b/.gitignore index 9325dd4..c77c2c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/instantiator-1.0.2.tar.gz -/instantiator-1.0.3.tar.gz +clog +/instantiator-1.0.4.tar.gz diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index 0928589..2f13cfb 100644 --- a/php-doctrine-instantiator.spec +++ b/php-doctrine-instantiator.spec @@ -1,6 +1,6 @@ # spec file for php-doctrine-instantiator # -# Copyright (c) 2014 Remi Collet +# Copyright (c) 2014-2015 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/3.0/ # @@ -9,7 +9,7 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit 8806c41c178ad4a2e87294b851d730779555d252 +%global gh_commit f976e5de371104877ebc89bd8fecb0019ed9c119 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator @@ -20,7 +20,7 @@ %endif Name: php-doctrine-instantiator -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: Instantiate objects in PHP without invoking their constructors @@ -30,13 +30,13 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz BuildArch: noarch +BuildRequires: %{_bindir}/phpab %if %{with_tests} BuildRequires: php(language) >= 5.3 BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection -BuildRequires: php-phpunit-PHPUnit -BuildRequires: php-theseer-autoload +BuildRequires: %{_bindir}/phpunit %endif # From composer.json @@ -58,7 +58,10 @@ instantiating PHP classes. %build -# Nothing +: Generate a simple autoloader +%{_bindir}/phpab \ + --output src/Doctrine/Instantiator/autoload.php \ + src/Doctrine/Instantiator %install @@ -69,7 +72,6 @@ cp -pr src/* %{buildroot}%{_datadir}/php %check %if %{with_tests} : Generate autoloader -%{_bindir}/php -d date.timezone=UTC \ %{_bindir}/phpab \ --basedir $PWD \ --output autoload.php \ @@ -86,14 +88,11 @@ then >PHPUnit/Autoload.php fi -sed -e 's/colors="true"//' \ - -e '/log/d' \ - phpunit.xml.dist >phpunit.xml +sed -e '/log/d' phpunit.xml.dist >phpunit.xml : Run test suite %{_bindir}/phpunit \ - --bootstrap autoload.php \ - -d date.timezone=UTC + --bootstrap autoload.php %else : Test suite disabled %endif @@ -108,6 +107,10 @@ sed -e 's/colors="true"//' \ %changelog +* Fri Feb 13 2015 Remi Collet - 1.0.4-1 +- update to 1.0.4 (no change) +- add autoloader + * Sun Oct 5 2014 Remi Collet - 1.0.3-1 - update to 1.0.3 diff --git a/sources b/sources index 247ea7a..44f15e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a82194b60ca464f0dbc4b718be52a88 instantiator-1.0.3.tar.gz +d18899c449e39fe88aa5a22540178149 instantiator-1.0.4.tar.gz