switch to Laminas

use range dependencies

2 files changed, 125 insertions, 55 deletions

diff --git a/composer.json b/composer.json
index ce9b624..1b3f66c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,32 +1,47 @@
 {
-    "name": "zendframework/zend-mvc-plugins",
-    "description": "Collection of all stable zend-mvc plugins served via separate packages.",
+    "name": "laminas/laminas-mvc-plugins",
+    "description": "Collection of all stable laminas-mvc plugins served via separate packages.",
     "type": "metapackage",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "laminas",
         "mvc",
         "plugins"
     ],
-    "homepage": "https://github.com/zendframework/zend-mvc-plugins",
+    "homepage": "https://laminas.dev",
+    "support": {
+        "docs": "https://docs.laminas.dev/laminas-mvc-plugins/",
+        "issues": "https://github.com/laminas/laminas-mvc-plugins/issues",
+        "source": "https://github.com/laminas/laminas-mvc-plugins",
+        "rss": "https://github.com/laminas/laminas-mvc-plugins/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
         },
-        "zf": {
+        "laminas": {
             "component": [
-                "Zend\\Mvc\\Plugin\\FilePrg",
-                "Zend\\Mvc\\Plugin\\FlashMessenger",
-                "Zend\\Mvc\\Plugin\\Identity",
-                "Zend\\Mvc\\Plugin\\Prg"
+                "Laminas\\Mvc\\Plugin\\FilePrg",
+                "Laminas\\Mvc\\Plugin\\FlashMessenger",
+                "Laminas\\Mvc\\Plugin\\Identity",
+                "Laminas\\Mvc\\Plugin\\Prg"
             ]
         }
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-mvc-plugin-fileprg": "^1.0",
-        "zendframework/zend-mvc-plugin-flashmessenger": "^1.0",
-        "zendframework/zend-mvc-plugin-identity": "^1.0",
-        "zendframework/zend-mvc-plugin-prg": "^1.0"
+        "laminas/laminas-mvc-plugin-fileprg": "^1.0",
+        "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
+        "laminas/laminas-mvc-plugin-identity": "^1.0",
+        "laminas/laminas-mvc-plugin-prg": "^1.0",
+        "laminas/laminas-zendframework-bridge": "^1.0"
+    },
+    "replace": {
+        "zendframework/zend-mvc-plugins": "self.version"
     }
 }
diff --git a/php-laminas-mvc-plugins.spec b/php-laminas-mvc-plugins.spec
index 5bf1432..0772483 100644
--- a/php-laminas-mvc-plugins.spec
+++ b/php-laminas-mvc-plugins.spec
@@ -1,64 +1,91 @@
-# remirepo/Fedora spec file for php-zendframework-zend-mvc-plugins
+# remirepo/Fedora spec file for php-laminas-mvc-plugins
 #
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b00cda46b0a95cbd32ea0743d6d7dc3fd2263f1b
+%global gh_commit    896104a57c3898c2ca932c1ec10c6a3afea2f815
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     zendframework
-%global gh_project   zend-mvc-plugins
+%global gh_owner     laminas
+%global gh_project   laminas-mvc-plugins
+%global zf_name      zend-mvc-plugins
 %global php_home     %{_datadir}/php
-%global library      Plugin
+%global namespace    Laminas
+%global library      Mvc
+%global subproj      Plugin
 
-Name:           php-%{gh_owner}-%{gh_project}
+Name:           php-%{gh_project}
 Version:        1.0.1
-Release:        5%{?dist}
-Summary:        Zend Framework Mvc-Plugins component
+Release:        1%{?dist}
+Summary:        %{namespace} Framework %{library}/%{subproj} component
 
 License:        BSD
-URL:            https://framework.zend.com/
+URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 BuildArch:      noarch
 # For test
 BuildRequires:  php-cli
-BuildRequires:  php-autoloader(%{gh_owner}/zend-mvc-plugin-fileprg)        >= 1.0
-BuildRequires:  php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) >= 1.0
-BuildRequires:  php-autoloader(%{gh_owner}/zend-mvc-plugin-identity)       >= 1.0
-BuildRequires:  php-autoloader(%{gh_owner}/zend-mvc-plugin-prg)            >= 1.0
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg)        >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg)        < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity)       >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity)       < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg)            >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg)            < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge)      >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge)      < 2)
+# remirepo:6
+%else
+BuildRequires:  php-laminas-mvc-plugin-fileprg
+BuildRequires:  php-laminas-mvc-plugin-flashmessenger
+BuildRequires:  php-laminas-mvc-plugin-identity
+BuildRequires:  php-laminas-mvc-plugin-prg
+BuildRequires:  php-laminas-zendframework-bridge
+%endif
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "zendframework/zend-mvc-plugin-fileprg": "^1.0",
-#        "zendframework/zend-mvc-plugin-flashmessenger": "^1.0",
-#        "zendframework/zend-mvc-plugin-identity": "^1.0",
-#        "zendframework/zend-mvc-plugin-prg": "^1.0"
+#        "laminas/laminas-mvc-plugin-fileprg": "^1.0",
+#        "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
+#        "laminas/laminas-mvc-plugin-identity": "^1.0",
+#        "laminas/laminas-mvc-plugin-prg": "^1.0",
+#        "laminas/laminas-zendframework-bridge": "^1.0"
 Requires:       php(language) >= 5.6
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-fileprg)        >= 1.0
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-fileprg)        <  2
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) >= 1.0
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-flashmessenger) <  2
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-identity)       >= 1.0
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-identity)       <  2
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-prg)            >= 1.0
-Requires:       php-autoloader(%{gh_owner}/zend-mvc-plugin-prg)            <  2
-
-Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg)        >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-fileprg)        < 2)
+Requires:      (php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) < 2)
+Requires:      (php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity)       >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-identity)       < 2)
+Requires:      (php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg)            >= 1.0    with php-autoloader(%{gh_owner}/laminas-mvc-plugin-prg)            < 2)
+Requires:      (php-autoloader(%{gh_owner}/laminas-zendframework-bridge)      >= 1.0    with php-autoloader(%{gh_owner}/laminas-zendframework-bridge)      < 2)
+# remirepo:6
+%else
+Requires:       php-laminas-mvc-plugin-fileprg
+Requires:       php-laminas-mvc-plugin-flashmessenger
+Requires:       php-laminas-mvc-plugin-identity
+Requires:       php-laminas-mvc-plugin-prg
+Requires:       php-laminas-zendframework-bridge
+%endif
+
+# Compatibily ensure by the bridge
+Obsoletes:      php-zendframework-%{zf_name}              < 1.0.1-99
+Provides:       php-zendframework-%{zf_name}              = %{version}-99
+Provides:       php-composer(%{gh_owner}/%{gh_project})   = %{version}
+Provides:       php-composer(zendframework/%{zf_name})    = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
+Provides:       php-autoloader(zendframework/%{zf_name})  = %{version}
 
 
 %description
-zend-mvc-plugins is a metapackage that provides a single package for
-installing all official zend-mvc plugins shipped as separate packages
-under the zendframework organization. Currently, these include:
+%{gh_project} is a metapackage that provides a single package for
+installing all official laminas-mvc plugins shipped as separate packages
+under the laminas organization. Currently, these include:
 
-* zendframework/zend-mvc-plugin-fileprg
-* zendframework/zend-mvc-plugin-flashmessenger
-* zendframework/zend-mvc-plugin-identity
-* zendframework/zend-mvc-plugin-prg
+* laminas/laminas-mvc-plugin-fileprg
+* laminas/laminas-mvc-plugin-flashmessenger
+* laminas/laminas-mvc-plugin-identity
+* laminas/laminas-mvc-plugin-prg
 
 
 %prep
@@ -73,32 +100,60 @@ cat << 'EOF' | tee autoload.php
 <?php
 require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/Zend/Mvc/Plugin/FilePrg/autoload.php',
-    '%{php_home}/Zend/Mvc/Plugin/FlashMessenger/autoload.php',
-    '%{php_home}/Zend/Mvc/Plugin/Identity/autoload.php',
-    '%{php_home}/Zend/Mvc/Plugin/Prg/autoload.php',
+    '%{php_home}/%{namespace}/Mvc/Plugin/FilePrg/autoload.php',
+    '%{php_home}/%{namespace}/Mvc/Plugin/FlashMessenger/autoload.php',
+    '%{php_home}/%{namespace}/Mvc/Plugin/Identity/autoload.php',
+    '%{php_home}/%{namespace}/Mvc/Plugin/Prg/autoload.php',
+]);
+EOF
+
+cat << 'EOF' | tee zf.php
+<?php
+require_once '%{php_home}/Fedora/Autoloader/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php',
+    dirname(dirname(dirname(__DIR__))) . '/%{namespace}/%{library}/%{subproj}/autoload.php',
 ]);
 EOF
 
 
 %install
-install -Dpm 644 autoload.php %{buildroot}%{php_home}/Zend/Mvc/%{library}/autoload.php
+: Laminas library
+install -Dpm 644 autoload.php %{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/autoload.php
+
+: Zend equiv
+install -Dpm 644 zf.php %{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php
 
 
 %check
 : Ensure autoloader works
-php -r 'require "%{buildroot}%{php_home}/Zend/Mvc/%{library}/autoload.php";'
+php -r '
+require "%{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/autoload.php";
+exit (class_exists("\\%{namespace}\\%{library}\\%{subproj}\\Prg\\Module") ? 0 : 1);
+'
+
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php";
+exit (class_exists("\\Zend\\%{library}\\%{subproj}\\FilePrg\\Module") ? 0 : 1);
+'
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
 %doc composer.json
-%{php_home}/Zend/Mvc/%{library}/autoload.php
+%{php_home}/Zend/%{library}/%{subproj}/autoload.php
+%{php_home}/%{namespace}/%{library}/%{subproj}/autoload.php
 
 
 %changelog
+* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 1.0.0-1
+- switch to Laminas
+- use range dependencies
+
 * Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 1.0.1-5
 - switch to fedora/autoloader