diff --git a/.gitignore b/.gitignore index 40352bd..37c5707 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /instantiator-1.0.4.tar.gz /instantiator-1.0.5-8e884e7.tar.gz /php-doctrine-instantiator-1.1.0-185b886.tgz +/php-doctrine-instantiator-1.2.0-a2c5901.tgz diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index a4a20de..a478789 100644 --- a/php-doctrine-instantiator.spec +++ b/php-doctrine-instantiator.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-doctrine-instantiator # -# Copyright (c) 2014-2017 Remi Collet +# Copyright (c) 2014-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit 185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda +%global gh_commit a2c590166b2133a4633738648b6b064edae0814a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator @@ -20,14 +20,14 @@ %endif Name: php-doctrine-instantiator -Version: 1.1.0 -Release: 3%{?dist} +Release: 1%{?dist} +%global major %nil +Version: 1.2.0 Summary: Instantiate objects in PHP without invoking their constructors -Group: Development/Libraries License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: php-%{gh_owner}-%{gh_project}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch @@ -38,7 +38,7 @@ BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection BuildRequires: php-spl -BuildRequires: phpunit6 >= 6.2.3 +BuildRequires: phpunit6 %endif # From composer.json @@ -50,6 +50,8 @@ Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) +Obsoletes: php-doctrine-instantiator11 < %{version}-%{release} +Provides: php-doctrine-instantiator11 = %{version}-%{release} Provides: php-composer(doctrine/instantiator) = %{version} @@ -71,8 +73,8 @@ instantiating PHP classes. %install -mkdir -p %{buildroot}%{_datadir}/php -cp -pr src/* %{buildroot}%{_datadir}/php +mkdir -p %{buildroot}%{_datadir}/php/Doctrine +cp -pr src/Doctrine/Instantiator %{buildroot}%{_datadir}/php/Doctrine/Instantiator%{major} %check @@ -89,7 +91,7 @@ EOF : Run test suite ret=0 -for cmd in php php71 php72; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \ %{_bindir}/phpunit6 \ @@ -103,14 +105,16 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md composer.json %dir %{_datadir}/php/Doctrine - %{_datadir}/php/Doctrine/Instantiator + %{_datadir}/php/Doctrine/Instantiator%{major} %changelog +* Mon Mar 25 2019 Remi Collet - 1.2.0-1 +- update to 1.2.0 + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -147,4 +151,4 @@ exit $ret - update to 1.0.3 * Mon Aug 25 2014 Remi Collet - 1.0.2-1 -- initial package, version 1.0.2 \ No newline at end of file +- initial package, version 1.0.2 diff --git a/sources b/sources index e972867..33a3bfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-instantiator-1.1.0-185b886.tgz) = e4870319af257742790c5d350cb8d1deff2f9260e35431f2c4b291ed13fe41aa232639a6ac1112c249ec8026980683b0aeff86f87c1e63b08ecf87f4be7348b6 +SHA512 (php-doctrine-instantiator-1.2.0-a2c5901.tgz) = 572483eef61f914faa90ac987b917b4041b4c457bb83001b78487ad6e4f6180412d27890994f3d5a79cb8f4f9e4b7c30cbb8edfb9edddbe40d3a045f8a2601b1