summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-jms-serializer.spec25
1 files changed, 16 insertions, 9 deletions
diff --git a/php-jms-serializer.spec b/php-jms-serializer.spec
index b2bd532..f3f922a 100644
--- a/php-jms-serializer.spec
+++ b/php-jms-serializer.spec
@@ -13,7 +13,7 @@
%global github_owner schmittjoh
%global github_name serializer
%global github_version 1.14.1
-%global github_commit 62c7ff6d61f8692eac8be024c542b3d9d0ab8c8a
+%global github_commit ba908d278fff27ec01fb4349f372634ffcd697c0
%global composer_vendor jms
%global composer_project serializer
@@ -25,7 +25,7 @@
%global with_symfony2 1
%endif
-# "php": ">=5.5.0"
+# "php": "^5.5|^7.0"
%global php_min_ver 5.5.0
# "doctrine/annotations": "^1.0"
# NOTE: Min version not 1.0 because autoloader required
@@ -38,8 +38,8 @@
# NOTE: Min version not 2.1 because autoloader required
%global doctrine_orm_min_ver 2.4.8
%global doctrine_orm_max_ver 3.0
-# "jms/metadata": "~1.1"
-# NOTE: Min version not 1.1 because autoloader required
+# "jms/metadata": "^1.3"
+# NOTE: Min version not 1.3 because autoloader required
%global jms_metadata_min_ver 1.6.0
%global jms_metadata_max_ver 2.0
# "jms/parser-lib": "1.*"
@@ -101,10 +101,10 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 2%{?github_release}%{?dist}
Summary: Library for (de-)serializing data of any complexity
-License: ASL 2.0
+License: MIT
URL: http://jmsyst.com/libs/serializer
# GitHub export contains non-allowable licened documentation.
@@ -166,7 +166,7 @@ BuildRequires: php-composer(twig/twig) >= %{twig_min_ver}
%endif
## phpcompatinfo (computed from version 1.14.1)
BuildRequires: php-composer(doctrine/cache) < 2
-BuildRequires: php-composer(doctrine/persistence) < 2
+BuildRequires: php-composer(doctrine/common) < 3
BuildRequires: php-date
BuildRequires: php-dom
BuildRequires: php-json
@@ -204,7 +204,7 @@ Requires: php-composer(phpoption/phpoption) < %{phpoption_max_ver}
Requires: php-composer(phpoption/phpoption) >= %{phpoption_min_ver}
%endif
# phpcompatinfo (computed from version 1.14.1)
-Requires: php-composer(doctrine/persistence) < 2
+Requires: php-composer(doctrine/common) < 3
Requires: php-date
Requires: php-dom
Requires: php-json
@@ -268,7 +268,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Doctrine/Common/Annotations/autoload.php',
- '%{phpdir}/Doctrine/Common/Persistence/autoload.php',
+ [
+ '%{phpdir}/Doctrine/Common/Persistence/autoload.php',
+ '%{phpdir}/Doctrine/Common/autoload.php',
+ ],
'%{phpdir}/Doctrine/Instantiator/autoload.php',
'%{phpdir}/JMS/Parser/autoload.php',
'%{phpdir}/Metadata/autoload.php',
@@ -387,6 +390,10 @@ exit $RETURN_CODE
%changelog
+* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 1.14.1-2
+- Update to 1.14.1
+- Change license from ASL 2.0 to MIT
+
* Tue Aug 18 2020 Shawn Iwinski <shawn@iwin.ski> - 1.14.1-1
- Update to 1.14.1
- Fix FTBFS (RHBZ #1865219)