From 6033bf99bc46ac4796f733236f8e71707c9ee60d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Aug 2017 06:57:40 +0200 Subject: switch --- php-ocramius-generated-hydrator.spec | 79 ++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 36 deletions(-) (limited to 'php-ocramius-generated-hydrator.spec') diff --git a/php-ocramius-generated-hydrator.spec b/php-ocramius-generated-hydrator.spec index 24a34e1..f351cdf 100644 --- a/php-ocramius-generated-hydrator.spec +++ b/php-ocramius-generated-hydrator.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-ocramius-generated-hydrator # -# Copyright (c) 2014-2016 Shawn Iwinski +# Copyright (c) 2014-2017 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,24 +12,23 @@ %global github_owner Ocramius %global github_name GeneratedHydrator -%global github_version 1.2.0 -%global github_commit ba0c96cfbf311203cf7664c566463f4530024ad1 +%global github_version 2.0.0 +%global github_commit 98a731e7d4e393513cb6f4e7f120da853680fb50 %global composer_vendor ocramius %global composer_project generated-hydrator -# "php": "~5.4|~7.0" -%global php_min_ver 5.4 -# "nikic/php-parser": "~1.0" -%global php_parser_min_ver 1.0 -%global php_parser_max_ver 2 -# "ocramius/code-generator-utils": "0.3.*" -# NOTE: Min version not 0.3.0 because autoloader required -%global ocramius_cgu_min_ver 0.3.2-4 -%global ocramius_cgu_max_ver 0.4.0 -# "zendframework/zend-stdlib": "~2.3" -%global zf_stdlib_min_ver 2.3 -%global zf_stdlib_max_ver 3.0 +# "php": "~7.0" +%global php_min_ver 7.0 +# "nikic/php-parser": "~2.0" +%global php_parser_min_ver 2.0 +%global php_parser_max_ver 3 +# "ocramius/code-generator-utils": "0.4.*" +%global ocramius_cgu_min_ver 0.4.0 +%global ocramius_cgu_max_ver 0.5 +# "zendframework/zend-hydrator": "~2.0" +%global zf_hydrator_min_ver 2.0 +%global zf_hydrator_max_ver 3 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -38,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: An object hydrator Group: Development/Libraries @@ -51,15 +50,14 @@ BuildArch: noarch %if %{with_tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -#BuildRequires: php-composer(ocramius/code-generator-utils) >= %%{ocramius_cgu_min_ver} -BuildRequires: php-ocramius-code-generator-utils >= %{ocramius_cgu_min_ver} +BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +BuildRequires: php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} BuildRequires: php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver} -BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(zendframework/zend-stdlib) >= %{zf_stdlib_min_ver} -BuildRequires: php-composer(zendframework/zend-stdlib) < %{zf_stdlib_max_ver} -# phpcompatinfo (computed from version 1.2.0) +BuildRequires: php-composer(phpunit/phpunit) >= 5.0 +BuildRequires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} +BuildRequires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} +# phpcompatinfo (computed from version 2.0.0) BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl @@ -69,18 +67,15 @@ BuildRequires: php-composer(symfony/class-loader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -#Requires: php-composer(ocramius/code-generator-utils) >= %%{ocramius_cgu_min_ver} -Requires: php-ocramius-code-generator-utils >= %{ocramius_cgu_min_ver} +Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +Requires: php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} Requires: php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver} -Requires: php-composer(zendframework/zend-stdlib) >= %{zf_stdlib_min_ver} -Requires: php-composer(zendframework/zend-stdlib) < %{zf_stdlib_max_ver} -# phpcompatinfo (computed from version 1.2.0) +Requires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} +Requires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} +# phpcompatinfo (computed from version 2.0.0) Requires: php-reflection Requires: php-spl -# Autoloader -Requires: php-composer(symfony/class-loader) # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -120,7 +115,7 @@ $fedoraClassLoader->addPrefix('GeneratedHydrator\\', dirname(__DIR__)); // Required dependencies require_once '%{phpdir}/CodeGenerationUtils/autoload.php'; -require_once '%{phpdir}/PhpParser/autoload.php'; +require_once '%{phpdir}/PhpParser2/autoload.php'; require_once '%{phpdir}/Zend/autoload.php'; return $fedoraClassLoader; @@ -165,12 +160,24 @@ rm -rf %{buildroot} %changelog -* Wed Oct 12 2016 Shawn Iwinski - 1.2.0-1 -- Update to 1.2.0 -- Add autoloader +* Mon Jan 23 2017 Remi Collet - 2.0.0-3 +- change BR order, fix FTBFS from Koschei + +* Wed Oct 12 2016 Remi Collet - 2.0.0-2 +- switch symfony autoloader + +* Wed Jun 29 2016 Remi Collet - 2.0.0-1 +- update to 2.0.0 +- drop dependency on zendframework/zend-stdlib +- raise dependency on php ~7.0 +- raise dependency on nikic/php-parser ~2.0 +- raise dependency on ocramius/code-generator-utils 0.4.* +- add dependency on zendframework/zend-hydrator +- add simple autoloader * Wed Feb 25 2015 Remi Collet - 1.1.1-1 -- update to 1.1.1 +- update to 1.1.1 (no change) +- raise nikic/php-parser max version * Sat Nov 29 2014 Remi Collet - 1.1.0-1 - backport for remi repo -- cgit