summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-26 11:40:14 +0100
committerRemi Collet <remi@remirepo.net>2019-02-26 11:40:14 +0100
commit8b8d5b62dcebaaee730ec4def23a5b6b1edb6b7f (patch)
treee77d7292de79053cd9648220db0b42872b016932
parent383628a4de76cf3642a2bbf29d1d70ac1a22eabc (diff)
cleanup for EL-8HEADmaster
-rw-r--r--php-jms-serializer.spec13
1 files changed, 8 insertions, 5 deletions
diff --git a/php-jms-serializer.spec b/php-jms-serializer.spec
index 82e07d0..1dd02bf 100644
--- a/php-jms-serializer.spec
+++ b/php-jms-serializer.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-jms-serializer
#
-# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -63,7 +63,7 @@
# "twig/twig": "~1.12|~2.0"
# NOTE: Min version not 1.12 because autoloader required
%global twig_min_ver 1.18.2
-%if 0%{?fedora} >= 25
+%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
%global twig_max_ver 3.0
%else
%global twig_max_ver 2.0
@@ -76,7 +76,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 5%{?github_release}%{?dist}
Summary: Library for (de-)serializing data of any complexity
Group: Development/Libraries
@@ -160,7 +160,7 @@ Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
-%if 0%{?fedora}
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
# Weak dependencies
Suggests: php-composer(symfony/yaml)
Suggests: php-composer(doctrine/collections)
@@ -291,7 +291,7 @@ sed 's/function testInlineArray/function SKIP_testInlineArray/' \
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in php php56 php70 php71 php72; do
+for PHP_EXEC in php php71 php72 php73; do
if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then
if [ $($PHP_EXEC -r 'echo PHP_VERSION_ID;') -lt 70200 ]; then
sed \
@@ -318,6 +318,9 @@ exit $RETURN_CODE
%changelog
+* Tue Feb 26 2019 Remi Collet <remi@remirepo.net> - 1.10.0-5
+- cleanup for EL-8
+
* Thu Dec 14 2017 Shawn Iwinski <shawn@iwin.ski> - 1.10.0-1
- Update to 1.10.0 (RHBZ #1508429)
- Allow Symfony 3