diff options
| author | Remi Collet <remi@remirepo.net> | 2017-10-09 06:50:52 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-10-09 06:50:52 +0200 |
| commit | 599acc4318fd140ff236695fb4d3c57bfdf8a25b (patch) | |
| tree | 9233bc264d724921150640c7fbaa318c97014279 | |
| parent | a33673e63e7e85740df0b340eafb96c8682a084a (diff) | |
v1.9.0 from Fedora
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-jms-serializer.spec | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/composer.json b/composer.json index 46cee1c..cde6cce 100644 --- a/composer.json +++ b/composer.json @@ -60,7 +60,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } } } diff --git a/php-jms-serializer.spec b/php-jms-serializer.spec index 3923771..3653e9f 100644 --- a/php-jms-serializer.spec +++ b/php-jms-serializer.spec @@ -12,8 +12,8 @@ %global github_owner schmittjoh %global github_name serializer -%global github_version 1.8.1 -%global github_commit ce65798f722c836f16d5d7d2e3ca9d21e0fb4331 +%global github_version 1.9.0 +%global github_commit f4683f41ebf21e60667447bb49939bee35807c3c %global composer_vendor jms %global composer_project serializer @@ -87,6 +87,7 @@ Source1: %{name}-get-source.sh BuildArch: noarch # Tests %if %{with_tests} +BuildRequires: php-cli ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver} @@ -240,14 +241,6 @@ require '%{buildroot}%{phpdir}/JMS/Serializer/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('JMS\\Serializer\\Tests\\', __DIR__.'/tests'); -if (PHP_VERSION_ID < 70000) { - $twig = '%{phpdir}/Twig/autoload.php'; -} else { - $twig = [ - '%{phpdir}/Twig2/autoload.php', - '%{phpdir}/Twig/autoload.php', - ]; -} \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/Doctrine/ORM/autoload.php', '%{phpdir}/Symfony/Component/ExpressionLanguage/autoload.php', @@ -255,7 +248,12 @@ if (PHP_VERSION_ID < 70000) { '%{phpdir}/Symfony/Component/Form/autoload.php', '%{phpdir}/Symfony/Component/Translation/autoload.php', '%{phpdir}/Symfony/Component/Validator/autoload.php', - $twig, + (PHP_VERSION_ID < 70000) + ? '%{phpdir}/Twig/autoload.php' + : [ + '%{phpdir}/Twig2/autoload.php', + '%{phpdir}/Twig/autoload.php', + ], ]); use Doctrine\Common\Annotations\AnnotationRegistry; @@ -296,6 +294,11 @@ exit $RETURN_CODE %changelog +* Sat Oct 07 2017 Shawn Iwinski <shawn@iwin.ski> - 1.9.0-1 +- Update to 1.9.0 +- Copy some remirepo modifications to make backporting easier: + https://git.remirepo.net/cgit/rpms/php/jms/php-jms-serializer.git/commit/?id=a33673e63e7e85740df0b340eafb96c8682a084a + * Sat Aug 12 2017 Shawn Iwinski <shawn@iwin.ski> - 1.8.1-1 - Update to 1.8.1 |