From b747d41a9b40a8516c7b7893389781ab1b25d4ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2017 06:04:19 +0200 Subject: [PATCH 1/2] Update to 1.7.0 raise dependency on PHP 5.6 (cherry picked from commit 150ba9985ed222b7d88b52239808729011d34d2a) (cherry picked from commit 0dc7a7a46c79424b5a7374a99106476eed7c9cef) --- .gitignore | 1 + php-myclabs-deep-copy-autoload.php | 1 + php-myclabs-deep-copy.spec | 26 ++++++++++++++++++-------- sources | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 881fa72..053694e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-myclabs-deep-copy-1.5.5-399c1f9.tgz /php-myclabs-deep-copy-1.6.0-5a5a9fc.tgz /php-myclabs-deep-copy-1.6.1-8e6e041.tgz +/php-myclabs-deep-copy-1.7.0-3b8a3a9.tgz diff --git a/php-myclabs-deep-copy-autoload.php b/php-myclabs-deep-copy-autoload.php index 57c6dfe..7392447 100644 --- a/php-myclabs-deep-copy-autoload.php +++ b/php-myclabs-deep-copy-autoload.php @@ -2,6 +2,7 @@ /* Autoloader for myclabs/deep-copy and its dependencies */ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; +require_once __DIR__ . '/deep_copy.php'; \Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', __DIR__); diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec index 3c1af0c..8e52f46 100644 --- a/php-myclabs-deep-copy.spec +++ b/php-myclabs-deep-copy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 8e6e04167378abf1ddb4d3522d8755c5fd90d102 +%global gh_commit 3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project DeepCopy @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-myclabs-deep-copy -Version: 1.6.1 +Version: 1.7.0 Release: 1%{?dist} Summary: Create deep copies (clones) of your objects @@ -30,21 +30,25 @@ Source2: %{name}-autoload.php BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 5.4 +BuildRequires: php(language) >= 5.6 BuildRequires: php-reflection BuildRequires: php-spl # From composer.json, "require-dev": { -# "doctrine/collections": "1.*", -# "phpunit/phpunit": "~4.1" -BuildRequires: php-composer(doctrine/collections) >= 1 +# "doctrine/collections": "^1.0", +# "doctrine/common": "^2.6", +# "phpunit/phpunit": "^4.1" +BuildRequires: php-composer(doctrine/collections) < 2 +BuildRequires: php-composer(doctrine/collections) >= 1.0 +BuildRequires: php-composer(doctrine/common) < 3 +BuildRequires: php-composer(doctrine/common) >= 2.6 BuildRequires: php-composer(phpunit/phpunit) >= 4.1 # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=5.4.0" -Requires: php(language) >= 5.4 +# "php": "^5.6 || ^7.0" +Requires: php(language) >= 5.6 # From phpcompatinfo report for version 1.3.0 Requires: php-reflection Requires: php-spl @@ -81,8 +85,10 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 1.7.0-1 +- Update to 1.7.0 +- raise dependency on PHP 5.6 + * Thu Apr 13 2017 Remi Collet - 1.6.1-1 - Update to 1.6.1 diff --git a/sources b/sources index 01d2d96..5844027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-deep-copy-1.6.1-8e6e041.tgz) = d7daab1cc6fa40e9be0d6929f2b4887235f2d4436c84ae6bffa3747bec98bf608351aaa11ef9b4125b3a24a35d9f7b8093c2bbfd1ddc60c1fe2f1b7d0dc81131 +SHA512 (php-myclabs-deep-copy-1.7.0-3b8a3a9.tgz) = c8a122081d9c1bc8dbd1dd1f02db20b7e0cb1e130050e1dd11bb9b9f17cbc7eedd10f05dd3f68f869496a483fd61725e8168cf616b27629a52c779fd677426ad From d1e97ffb1753c110ae388469c5ca68ec0f6d764c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2017 06:20:58 +0200 Subject: [PATCH 2/2] Revert "Update to 1.7.0" This reverts commit b747d41a9b40a8516c7b7893389781ab1b25d4ca. --- .gitignore | 1 - php-myclabs-deep-copy-autoload.php | 1 - php-myclabs-deep-copy.spec | 26 ++++++++------------------ sources | 2 +- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 053694e..881fa72 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ clog /php-myclabs-deep-copy-1.5.5-399c1f9.tgz /php-myclabs-deep-copy-1.6.0-5a5a9fc.tgz /php-myclabs-deep-copy-1.6.1-8e6e041.tgz -/php-myclabs-deep-copy-1.7.0-3b8a3a9.tgz diff --git a/php-myclabs-deep-copy-autoload.php b/php-myclabs-deep-copy-autoload.php index 7392447..57c6dfe 100644 --- a/php-myclabs-deep-copy-autoload.php +++ b/php-myclabs-deep-copy-autoload.php @@ -2,7 +2,6 @@ /* Autoloader for myclabs/deep-copy and its dependencies */ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -require_once __DIR__ . '/deep_copy.php'; \Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', __DIR__); diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec index 8e52f46..3c1af0c 100644 --- a/php-myclabs-deep-copy.spec +++ b/php-myclabs-deep-copy.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e +%global gh_commit 8e6e04167378abf1ddb4d3522d8755c5fd90d102 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project DeepCopy @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-myclabs-deep-copy -Version: 1.7.0 +Version: 1.6.1 Release: 1%{?dist} Summary: Create deep copies (clones) of your objects @@ -30,25 +30,21 @@ Source2: %{name}-autoload.php BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 5.4 BuildRequires: php-reflection BuildRequires: php-spl # From composer.json, "require-dev": { -# "doctrine/collections": "^1.0", -# "doctrine/common": "^2.6", -# "phpunit/phpunit": "^4.1" -BuildRequires: php-composer(doctrine/collections) < 2 -BuildRequires: php-composer(doctrine/collections) >= 1.0 -BuildRequires: php-composer(doctrine/common) < 3 -BuildRequires: php-composer(doctrine/common) >= 2.6 +# "doctrine/collections": "1.*", +# "phpunit/phpunit": "~4.1" +BuildRequires: php-composer(doctrine/collections) >= 1 BuildRequires: php-composer(phpunit/phpunit) >= 4.1 # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": "^5.6 || ^7.0" -Requires: php(language) >= 5.6 +# "php": ">=5.4.0" +Requires: php(language) >= 5.4 # From phpcompatinfo report for version 1.3.0 Requires: php-reflection Requires: php-spl @@ -85,10 +81,8 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 1.7.0-1 -- Update to 1.7.0 -- raise dependency on PHP 5.6 - * Thu Apr 13 2017 Remi Collet - 1.6.1-1 - Update to 1.6.1 diff --git a/sources b/sources index 5844027..01d2d96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-deep-copy-1.7.0-3b8a3a9.tgz) = c8a122081d9c1bc8dbd1dd1f02db20b7e0cb1e130050e1dd11bb9b9f17cbc7eedd10f05dd3f68f869496a483fd61725e8168cf616b27629a52c779fd677426ad +SHA512 (php-myclabs-deep-copy-1.6.1-8e6e041.tgz) = d7daab1cc6fa40e9be0d6929f2b4887235f2d4436c84ae6bffa3747bec98bf608351aaa11ef9b4125b3a24a35d9f7b8093c2bbfd1ddc60c1fe2f1b7d0dc81131