From f10d9657f53821f2412afc63a05680f472e21d08 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Nov 30 2016 17:45:59 +0000 Subject: update to 5.4.0 - raise dependency on php-di/invoker >= 1.3.2 - raise dependency on php >=5.5.0 - allow ocramius/proxy-manager 2.0 --- diff --git a/.gitignore b/.gitignore index a9efddb..3205f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +clog /php-di-5.2.0-e20ff1b465a15548e22efcea79e06df64d9e2068.tar.gz /php-di-5.2.2-f574bcc841201ab04587b1c6da1234d4044f67d8.tar.gz +/php-di-5.4.0-e348393488fa909e4bc0707ba5c9c44cd602a1cb.tar.gz diff --git a/php-di.spec b/php-di.spec index 2dba46f..d7dfbc7 100644 --- a/php-di.spec +++ b/php-di.spec @@ -11,14 +11,14 @@ %global github_owner PHP-DI %global github_name PHP-DI -%global github_version 5.2.2 -%global github_commit f574bcc841201ab04587b1c6da1234d4044f67d8 +%global github_version 5.4.0 +%global github_commit e348393488fa909e4bc0707ba5c9c44cd602a1cb %global composer_vendor php-di %global composer_project php-di -# "php": ">=5.4.0" -%global php_min_ver 5.4.0 +# "php": ">=5.5.0" +%global php_min_ver 5.5.0 # "container-interop/container-interop": "~1.0" %global container_interop_min_ver 1.0 %global container_interop_max_ver 2.0 @@ -31,15 +31,15 @@ # "mnapoli/phpunit-easymock": "~0.2.0" %global phpunit_easymock_min_ver 0.2.0 %global phpunit_easymock_max_ver 1.0 -# "php-di/invoker": "^1.1.1" -%global di_invoker_min_ver 1.1.1 +# "php-di/invoker": "^1.3.2" +%global di_invoker_min_ver 1.3.2 %global di_invoker_max_ver 2.0 # "php-di/phpdoc-reader": "^2.0.1" %global di_phpdoc_reader_min_ver 2.0.1 %global di_phpdoc_reader_max_ver 3.0 -# "ocramius/proxy-manager": "~1.0" +# "ocramius/proxy-manager": "~1.0|~2.0" %global proxy_manager_min_ver 1.0 -%global proxy_manager_max_ver 2.0 +%global proxy_manager_max_ver 3.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -48,7 +48,7 @@ Name: %{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: The dependency injection container for humans Group: Development/Libraries @@ -73,7 +73,7 @@ BuildRequires: php-composer(ocramius/proxy-manager) >= %{proxy_mana BuildRequires: php-composer(php-di/invoker) >= %{di_invoker_min_ver} BuildRequires: php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver} BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 5.2.2) +## phpcompatinfo (computed from version 5.4.0) BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-reflection @@ -90,7 +90,7 @@ Requires: php-composer(php-di/invoker) >= %{di_invoker Requires: php-composer(php-di/invoker) < %{di_invoker_max_ver} Requires: php-composer(php-di/phpdoc-reader) >= %{di_phpdoc_reader_min_ver} Requires: php-composer(php-di/phpdoc-reader) < %{di_phpdoc_reader_max_ver} -# phpcompatinfo (computed from version 5.2.2) +# phpcompatinfo (computed from version 5.4.0) Requires: php-json Requires: php-pcre Requires: php-reflection @@ -98,7 +98,7 @@ Requires: php-spl # Autoloader Requires: php-composer(symfony/class-loader) # Weak dependencies -%if 0%{?fedora} >= 20 +%if 0%{?fedora} >= 21 Suggests: php-composer(doctrine/annotations) Suggests: php-composer(doctrine/cache) Suggests: php-composer(mnapoli/phpunit-easymock) @@ -117,6 +117,7 @@ Conflicts: php-composer(ocramius/proxy-manager) >= %{proxy_mana Provides: php-%{composer_vendor}-%{composer_project} = %{version}-%{release} # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} +Provides: php-composer(container-interop/container-interop-implementation) = 1.0 %description %{summary}. @@ -230,6 +231,12 @@ sed -e '/@test/d' \ %changelog +* Fri Oct 28 2016 Remi Collet - 5.4.0-1 +- update to 5.4.0 +- raise dependency on php-di/invoker >= 1.3.2 +- raise dependency on php >=5.5.0 +- allow ocramius/proxy-manager 2.0 + * Sun Jul 31 2016 Shawn Iwinski - 5.2.2-3 - Updated autoloader to not use `@include_once` - Skipped tests known to fail with "php-composer(php-di/invoker)" >= 1.3.2 diff --git a/sources b/sources index 33a05ec..96d03c0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 7a718ddbed4d40c8ce67ad41b8875565 php-di-5.2.2-f574bcc841201ab04587b1c6da1234d4044f67d8.tar.gz +38f8292333a9cf59b1fa13aaa7cd5963 php-di-5.4.0-e348393488fa909e4bc0707ba5c9c44cd602a1cb.tar.gz