diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-06-17 06:48:44 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-06-17 06:48:44 +0200 |
| commit | 3c00ab33852dfb3526da5ccc7a055dd813844056 (patch) | |
| tree | b5e77905221c250be140d1fec55595c2b2d935d7 | |
| parent | 6224f8e8f69c68324035d89c005a3626f4fa59c2 (diff) | |
php-symfony-polyfill: 1.2.0 (backported from Fedora)
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-symfony-polyfill.spec | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/composer.json b/composer.json index fc21007..47706df 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "ircmaxell/password-compat": "~1.0", - "paragonie/random_compat": "~1.0", + "paragonie/random_compat": "~1.0|~2.0", "symfony/intl": "~2.3|~3.0" }, "replace": { @@ -59,7 +59,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } } } diff --git a/php-symfony-polyfill.spec b/php-symfony-polyfill.spec index fcdf45a..96a6e87 100644 --- a/php-symfony-polyfill.spec +++ b/php-symfony-polyfill.spec @@ -12,14 +12,17 @@ %global github_owner symfony %global github_name polyfill -%global github_version 1.1.1 -%global github_commit 3dc21aeff3e1f8cb708421ed02cf1a8901d7b535 +%global github_version 1.2.0 +%global github_commit ee2c9c2576fdd4a42b024260a1906a9888770c34 %global composer_vendor symfony %global composer_project polyfill # "php": ">=5.3.3" %global php_min_ver 5.3.3 +# "paragonie/random_compat": "~1.0|~2.0" +%global paragonie_random_compat_min_ver 1.0 +%global paragonie_random_compat_max_ver 3.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -46,8 +49,8 @@ BuildRequires: php-composer(phpunit/phpunit) ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(ircmaxell/password-compat) -BuildRequires: php-composer(paragonie/random_compat) -## phpcompatinfo (computed from version 1.1.1) +BuildRequires: php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver} +## phpcompatinfo (computed from version 1.2.0) BuildRequires: php-hash BuildRequires: php-json BuildRequires: php-ldap @@ -60,8 +63,9 @@ BuildRequires: php-spl # composer.json Requires: php(language) >= %{php_min_ver} Requires: php-composer(ircmaxell/password-compat) -Requires: php-composer(paragonie/random_compat) -# phpcompatinfo (computed from version 1.1.1) +Requires: php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver} +Requires: php-composer(paragonie/random_compat) < %{paragonie_random_compat_max_ver} +# phpcompatinfo (computed from version 1.2.0) Requires: php-hash Requires: php-json Requires: php-mbstring @@ -168,6 +172,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 16 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.2.0-1 +- Updated to 1.2.0 (RHBZ #1301791) + * Tue Apr 12 2016 Shawn Iwinski <shawn.iwinski@gmail.com> - 1.1.1-1 - Updated to 1.1.1 (RHBZ #1301791) |