- update to 1.2.0 (no change)HEADmaster

- raise dependency on zend-stdlib 3.2.1

2 files changed, 16 insertions, 15 deletions

diff --git a/composer.json b/composer.json
index 09aa0fa..74f617b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,15 +19,12 @@
         "php": "^5.6 || ^7.0",
         "zendframework/zend-mvc": "^3.0",
         "zendframework/zend-session": "^2.8.5",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+        "zendframework/zend-stdlib": "^3.2.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
-    "conflict": {
-        "zendframework/zend-mvc": "<3.0.0"
-    },
     "autoload": {
         "psr-4": {
             "Zend\\Mvc\\Plugin\\Prg\\": "src/"
@@ -43,8 +40,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev",
-            "dev-develop": "1.2.x-dev"
+            "dev-master": "1.2.x-dev",
+            "dev-develop": "1.3.x-dev"
         },
         "zf": {
             "component": "Zend\\Mvc\\Plugin\\Prg"
diff --git a/php-zendframework-zend-mvc-plugin-prg.spec b/php-zendframework-zend-mvc-plugin-prg.spec
index 2d88b2c..68a381c 100644
--- a/php-zendframework-zend-mvc-plugin-prg.spec
+++ b/php-zendframework-zend-mvc-plugin-prg.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    9b9d555f936002b90f14fbbfe477e734601307b2
+%global gh_commit    090afc28bcf0f7043ed8d7da712ac1b5964ab7d7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-mvc-plugin-prg
@@ -20,11 +20,10 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Zend Framework Mvc-Plugin-%{library} component
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
@@ -41,7 +40,7 @@ BuildRequires:  php(language) >= 5.6
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc)              >= 3.0   with php-autoloader(%{gh_owner}/zend-mvc)              <  4)
 BuildRequires: (php-autoloader(%{gh_owner}/zend-session)          >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session)          <  3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)           >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)           >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
 %global phpunit %{_bindir}/phpunit7
 BuildRequires:  phpunit7 >= 7.1.4
 # remirepo:10
@@ -51,7 +50,7 @@ BuildRequires:  php-autoloader(%{gh_owner}/zend-mvc)              >= 3.0
 BuildRequires:  php-autoloader(%{gh_owner}/zend-session)          <  3
 BuildRequires:  php-autoloader(%{gh_owner}/zend-session)          >= 2.8.5
 BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)           <  4
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)           >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)           >= 3.2.1
 %global phpunit %{_bindir}/phpunit6
 BuildRequires:  phpunit6 >= 6.5.8
 %endif
@@ -63,13 +62,13 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "php": "^5.6 || ^7.0",
 #        "zendframework/zend-mvc": "^3.0",
 #        "zendframework/zend-session": "^2.8.5",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+#        "zendframework/zend-stdlib": "^3.2.1"
 Requires:       php(language) >= 5.6
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-autoloader(%{gh_owner}/zend-mvc)              >= 3.0   with php-autoloader(%{gh_owner}/zend-mvc)              <  4)
 Requires:      (php-autoloader(%{gh_owner}/zend-session)          >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session)          <  3)
-Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)           >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)           >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib)           <  4)
 # remirepo:8
 %else
 Requires:       php-autoloader(%{gh_owner}/zend-mvc)              <  4
@@ -77,7 +76,7 @@ Requires:       php-autoloader(%{gh_owner}/zend-mvc)              >= 3.0
 Requires:       php-autoloader(%{gh_owner}/zend-session)          <  3
 Requires:       php-autoloader(%{gh_owner}/zend-session)          >= 2.8.5
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)           <  4
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)           >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)           >= 3.2.1
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -129,7 +128,7 @@ require_once '%{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do
+for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
@@ -142,6 +141,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -150,6 +150,10 @@ exit $ret
 
 
 %changelog
+* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0 (no change)
+- raise dependency on zend-stdlib 3.2.1
+
 * Thu May  3 2018 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - update to 1.1.0
 - raise dependency on zend-session 2.8.5