- update to 3.0.2dev3

- raise dependency on PHP 5.5
- allow Symfony 4
- use range dependencies

2 files changed, 49 insertions, 32 deletions

diff --git a/composer.json b/composer.json
index cd0fab5..6c8849c 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9",
-        "symfony/security-core": "~2.4|~3.0.0"
+        "php": ">=5.5.9",
+        "symfony/security-core": "~2.8|~3.0|~4.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "~2.7|~3.0.0",
+        "symfony/phpunit-bridge": "~2.8|~3.0|~4.0",
         "doctrine/common": "~2.2",
         "doctrine/dbal": "~2.2",
         "psr/log": "~1.0"
@@ -39,7 +39,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/php-symfony-security-acl.spec b/php-symfony-security-acl.spec
index 6e5f86f..bc83392 100644
--- a/php-symfony-security-acl.spec
+++ b/php-symfony-security-acl.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-symfony-securiy-acl
 #
-# Copyright (c) 2016 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,19 +12,19 @@
 
 %global github_owner     symfony
 %global github_name      security-acl
-%global github_version   2.8.0
-%global github_commit    4a3f7327ad215242c78f6564ad4ea6d2db1b8347
+%global github_version   3.0.2
+%global github_commit    22928f6be80a37f301500c67e50f57f5b25ffaa8
 
 %global composer_vendor  symfony
 %global composer_project security-acl
 
-# "php": ">=5.3.9"
-%global php_min_ver 5.3.9
-# "symfony/phpunit-bridge": "~2.7|~3.0.0"
-# "symfony/security-core": "~2.4|~3.0.0"
+# "php": ">=5.5.9"
+%global php_min_ver 5.5.9
+# "symfony/phpunit-bridge": "~~2.8|~3.0|~4.0"
+# "symfony/security-core": "~2.8|~3.0|~4.0"
 #     NOTE: Min version not 2.7 because autoloader required
-%global symfony_min_ver 2.7.1
-%global symfony_max_ver 4.0
+%global symfony_min_ver 2.8
+%global symfony_max_ver 5
 # "doctrine/common": "~2.2"
 #     NOTE: Min version not 2.2 because autoloader required
 %global doctrine_common_min_ver 2.5.0
@@ -51,7 +51,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       4%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Symfony Security Component - ACL (Access Control List)
 
 Group:         Development/Libraries
@@ -64,16 +64,22 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires: php(language)                       >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:(php-composer(doctrine/common)       >= %{doctrine_common_min_ver} with php-composer(doctrine/common)       <  %{doctrine_common_max_ver})
+BuildRequires:(php-composer(doctrine/dbal)         >= %{doctrine_dbal_min_ver}    with php-composer(doctrine/dbal)         <  %{doctrine_dbal_max_ver})
+BuildRequires:(php-composer(psr/log)               >= %{psr_log_min_ver}          with php-composer(psr/log)               <  %{psr_log_max_ver})
+BuildRequires:(php-composer(symfony/security-core) >= %{symfony_min_ver}          with php-composer(symfony/security-core) <  %{symfony_max_ver})
+%else
 BuildRequires: php-composer(doctrine/common)       <  %{doctrine_common_max_ver}
 BuildRequires: php-composer(doctrine/common)       >= %{doctrine_common_min_ver}
 BuildRequires: php-composer(doctrine/dbal)         <  %{doctrine_dbal_max_ver}
 BuildRequires: php-composer(doctrine/dbal)         >= %{doctrine_dbal_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
 BuildRequires: php-composer(psr/log)               <  %{psr_log_max_ver}
 BuildRequires: php-composer(psr/log)               >= %{psr_log_min_ver}
-BuildRequires: php-composer(symfony/security-core) <  %{symfony_max_ver}
-BuildRequires: php-composer(symfony/security-core) >= %{symfony_min_ver}
-## phpcompatinfo (computed from version 2.8.0)
+BuildRequires: php-symfony3-security
+%endif
+BuildRequires: php-composer(phpunit/phpunit)
+## phpcompatinfo (computed from version 3.0.2)
 BuildRequires: php-pcre
 BuildRequires: php-reflection
 BuildRequires: php-spl
@@ -83,8 +89,11 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-Requires:      php-composer(symfony/security-core) <  %{symfony_max_ver}
-Requires:      php-composer(symfony/security-core) >= %{symfony_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:     (php-composer(symfony/security-core) >= %{symfony_min_ver}          with php-composer(symfony/security-core) <  %{symfony_max_ver})
+%else
+Requires:      php-symfony3-security
+%endif
 # phpcompatinfo (computed from version 2.8.0)
 Requires:      php-pcre
 Requires:      php-reflection
@@ -93,7 +102,7 @@ Requires:      php-spl
 Requires:      php-composer(fedora/autoloader)
 
 # Weak dependencies
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
 Suggests:      php-composer(doctrine/dbal)
 Suggests:      php-composer(symfony/finder)
 %endif
@@ -126,21 +135,23 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Security\\Acl\\', __DIR__);
 
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/DBAL/autoload.php',
-    array(
+    [
+        '%{phpdir}/Symfony4/Component/Security/autoload.php',
         '%{phpdir}/Symfony3/Component/Security/autoload.php',
         '%{phpdir}/Symfony/Component/Security/autoload.php',
-    ),
-));
+    ],
+]);
 
-\Fedora\Autoloader\Dependencies::optional(array(
+\Fedora\Autoloader\Dependencies::optional([
     '%{phpdir}/Doctrine/DBAL/autoload.php',
-    array(
+    [
+        '%{phpdir}/Symfony4/Component/Finder/autoload.php',
         '%{phpdir}/Symfony3/Component/Finder/autoload.php',
         '%{phpdir}/Symfony/Component/Finder/autoload.php',
-    ),
-));
+    ],
+]);
 AUTOLOAD
 
 
@@ -156,16 +167,16 @@ cat <<'BOOTSTRAP' | tee bootstrap.php
 <?php
 require_once '%{buildroot}%{phpdir}/Symfony/Component/Security/Acl/autoload.php';
 
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/Common/autoload.php',
     '%{phpdir}/Psr/Log/autoload.php',
-));
+]);
 BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do
+for PHP_EXEC in "" php71 php72 php73 php74; do
     if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php || RETURN_CODE=1
      fi
@@ -190,6 +201,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Dec  2 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1
+- update to 3.0.2
+- raise dependency on PHP 5.5
+- allow Symfony 4
+- use range dependencies
+
 * Thu Sep 21 2017 Shawn Iwinski <shawn@iwin.ski> - 2.8.0-4
 - Add max versions to BuildRequires
 - Switch autoloader to fedora/autoloader