summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Iwinski <siwinski@redhat.com>2017-12-14 21:56:47 -0500
committerRemi Collet <remi@remirepo.net>2017-12-15 07:20:52 +0100
commit18b1da9e71125d7631a0b410ba685c35ede66c3a (patch)
treeef9ab776ea13251ff5b797ff5b5cc900840868de
parent599acc4318fd140ff236695fb4d3c57bfdf8a25b (diff)
Update to 1.10.0 (RHBZ #1508429)
- Allow Symfony 3
-rw-r--r--composer.json4
-rw-r--r--php-jms-serializer.spec53
2 files changed, 47 insertions, 10 deletions
diff --git a/composer.json b/composer.json
index cde6cce..13251ad 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,8 @@
"jackalope/jackalope-doctrine-dbal": "^1.1.5",
"doctrine/phpcr-odm": "^1.3|^2.0",
"propel/propel1": "~1.7",
+ "psr/container": "^1.0",
+ "symfony/dependency-injection": "^2.7|^3.3|^4.0",
"symfony/yaml": "^2.1|^3.0",
"symfony/translation": "^2.1|^3.0",
"symfony/validator": "^2.2|^3.0",
@@ -60,7 +62,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.9-dev"
+ "dev-master": "1.10-dev"
}
}
}
diff --git a/php-jms-serializer.spec b/php-jms-serializer.spec
index 3653e9f..3b33a31 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.9.0
-%global github_commit f4683f41ebf21e60667447bb49939bee35807c3c
+%global github_version 1.10.0
+%global github_commit 62c7ff6d61f8692eac8be024c542b3d9d0ab8c8a
%global composer_vendor jms
%global composer_project serializer
@@ -47,6 +47,10 @@
# NOTE: Min version not 1.1 because autoloader required
%global phpoption_min_ver 1.5.0
%global phpoption_max_ver 2.0
+# "psr/container": "^1.0"
+%global psr_container_min_ver 1.0
+%global psr_container_max_ver 2.0
+# "symfony/dependency-injection": "^2.7|^3.3|^4.0"
# "symfony/expression-language": "^2.6|^3.0"
# "symfony/filesystem": "^2.1"
# "symfony/form": "~2.1|^3.0"
@@ -55,7 +59,7 @@
# "symfony/yaml": "^2.1|^3.0"
# NOTE: Min version not 2.6 because autoloader required
%global symfony_min_ver 2.7.1
-%global symfony_max_ver 3.0
+%global symfony_max_ver 4.0
# "twig/twig": "~1.12|~2.0"
# NOTE: Min version not 1.12 because autoloader required
%global twig_min_ver 1.18.2
@@ -106,6 +110,10 @@ BuildRequires: php-composer(phpcollection/phpcollection) >= %{phpcollection_min_
BuildRequires: php-composer(phpoption/phpoption) < %{phpoption_max_ver}
BuildRequires: php-composer(phpoption/phpoption) >= %{phpoption_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: php-composer(psr/container) < %{psr_container_max_ver}
+BuildRequires: php-composer(psr/container) >= %{psr_container_min_ver}
+BuildRequires: php-composer(symfony/dependency-injection) < %{symfony_max_ver}
+BuildRequires: php-composer(symfony/dependency-injection) >= %{symfony_min_ver}
BuildRequires: php-composer(symfony/expression-language) < %{symfony_max_ver}
BuildRequires: php-composer(symfony/expression-language) >= %{symfony_min_ver}
BuildRequires: php-composer(symfony/filesystem) < %{symfony_max_ver}
@@ -222,7 +230,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::optional([
'%{phpdir}/Doctrine/Common/Cache/autoload.php',
'%{phpdir}/Doctrine/Common/Collections/autoload.php',
- '%{phpdir}/SymfonyComponent/Yaml/autoload.php',
+ [
+ '%{phpdir}/Symfony3/Component/Yaml/autoload.php',
+ '%{phpdir}/Symfony/Component/Yaml/autoload.php',
+ ],
]);
AUTOLOAD
@@ -243,11 +254,31 @@ require '%{buildroot}%{phpdir}/JMS/Serializer/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Doctrine/ORM/autoload.php',
- '%{phpdir}/Symfony/Component/ExpressionLanguage/autoload.php',
- '%{phpdir}/Symfony/Component/Filesystem/autoload.php',
- '%{phpdir}/Symfony/Component/Form/autoload.php',
- '%{phpdir}/Symfony/Component/Translation/autoload.php',
- '%{phpdir}/Symfony/Component/Validator/autoload.php',
+ '%{phpdir}/Psr/Container/autoload.php',
+ [
+ '%{phpdir}/Symfony3/Component/DependencyInjection/autoload.php',
+ '%{phpdir}/Symfony/Component/DependencyInjection/autoload.php',
+ ],
+ [
+ '%{phpdir}/Symfony3/Component/ExpressionLanguage/autoload.php',
+ '%{phpdir}/Symfony/Component/ExpressionLanguage/autoload.php',
+ ],
+ [
+ '%{phpdir}/Symfony3/Component/Filesystem/autoload.php',
+ '%{phpdir}/Symfony/Component/Filesystem/autoload.php',
+ ],
+ [
+ '%{phpdir}/Symfony3/Component/Form/autoload.php',
+ '%{phpdir}/Symfony/Component/Form/autoload.php',
+ ],
+ [
+ '%{phpdir}/Symfony3/Component/Translation/autoload.php',
+ '%{phpdir}/Symfony/Component/Translation/autoload.php',
+ ],
+ [
+ '%{phpdir}/Symfony3/Component/Validator/autoload.php',
+ '%{phpdir}/Symfony/Component/Validator/autoload.php',
+ ],
(PHP_VERSION_ID < 70000)
? '%{phpdir}/Twig/autoload.php'
: [
@@ -294,6 +325,10 @@ exit $RETURN_CODE
%changelog
+* Thu Dec 14 2017 Shawn Iwinski <shawn@iwin.ski> - 1.10.0-1
+- Update to 1.10.0 (RHBZ #1508429)
+- Allow Symfony 3
+
* 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: