From b0f1f0905ba3ec32f3c64ee0363e3fe7804b35d7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 27 Mar 2020 07:55:46 +0100
Subject: v1.0.2

---
 composer.json                              |  1 -
 php-laminas-zendframework-bridge-rpm.patch | 24 ++++++++++++------------
 php-laminas-zendframework-bridge.spec      | 11 +++++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index c43db4b..e4c9941 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,6 @@
         "zendframework"
     ],
     "support": {
-        "docs": "https://docs.laminas.dev/laminas-zendframework-bridge/",
         "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
         "source": "https://github.com/laminas/laminas-zendframework-bridge",
         "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch
index d46d2c1..8edfafb 100644
--- a/php-laminas-zendframework-bridge-rpm.patch
+++ b/php-laminas-zendframework-bridge-rpm.patch
@@ -1,6 +1,6 @@
-diff -up src/Autoloader.php.rpm src/Autoloader.php
---- src/Autoloader.php.rpm	2020-01-06 11:58:27.000000000 +0100
-+++ src/Autoloader.php	2020-01-06 13:35:58.942532257 +0100
+diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
+--- ./src/Autoloader.php.rpm	2020-03-27 07:50:26.000000000 +0100
++++ ./src/Autoloader.php	2020-03-27 07:51:49.165983073 +0100
 @@ -9,7 +9,6 @@
  namespace Laminas\ZendFrameworkBridge;
  
@@ -8,8 +8,8 @@ diff -up src/Autoloader.php.rpm src/Autoloader.php
 -use Composer\Autoload\ClassLoader;
  use RuntimeException;
  
- /**
-@@ -38,7 +37,6 @@ class Autoloader
+ use function array_values;
+@@ -50,7 +49,6 @@ class Autoloader
  
          spl_autoload_register(self::createPrependAutoloader(
              RewriteRules::namespaceReverse(),
@@ -17,7 +17,7 @@ diff -up src/Autoloader.php.rpm src/Autoloader.php
              $loaded
          ), true, true);
  
-@@ -49,32 +47,15 @@ class Autoloader
+@@ -61,32 +59,15 @@ class Autoloader
      }
  
      /**
@@ -52,7 +52,7 @@ diff -up src/Autoloader.php.rpm src/Autoloader.php
              if (isset($loaded[$class])) {
                  return;
              }
-@@ -93,7 +74,7 @@ class Autoloader
+@@ -105,7 +86,7 @@ class Autoloader
                  return;
              }
  
@@ -61,10 +61,10 @@ diff -up src/Autoloader.php.rpm src/Autoloader.php
                  $legacy = $namespaces[$check]
                      . strtr(substr($class, strlen($check)), [
                          'ApiTools' => 'Apigility',
-diff -up src/Replacements.php.rpm src/Replacements.php
---- src/Replacements.php.rpm	2020-01-06 11:58:27.000000000 +0100
-+++ src/Replacements.php	2020-01-06 13:32:48.361356190 +0100
-@@ -16,7 +16,7 @@ class Replacements
+diff -up ./src/Replacements.php.rpm ./src/Replacements.php
+--- ./src/Replacements.php.rpm	2020-03-27 07:50:49.818286139 +0100
++++ ./src/Replacements.php	2020-03-27 07:52:36.321742255 +0100
+@@ -21,7 +21,7 @@ class Replacements
      public function __construct(array $additionalReplacements = [])
      {
          $this->replacements = array_merge(
@@ -72,4 +72,4 @@ diff -up src/Replacements.php.rpm src/Replacements.php
 +            require __DIR__ . '/config/replacements.php',
              $additionalReplacements
          );
-     }
+ 
diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec
index 39d29d1..3cb88eb 100644
--- a/php-laminas-zendframework-bridge.spec
+++ b/php-laminas-zendframework-bridge.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    0fb9675b84a1666ab45182b6c5b29956921e818d
+%global gh_commit    faf68f6109ceeff24241226033ab59640c7eb63b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     laminas
 %global gh_project   laminas-zendframework-bridge
@@ -21,8 +21,8 @@
 %endif
 
 Name:           php-%{gh_project}
-Version:        1.0.1
-Release:        5%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Alias legacy ZF class names to Laminas Project equivalents
 
 License:        BSD
@@ -83,7 +83,7 @@ Documentation: https://docs.laminas.dev/%{gh_project}/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 %patch0 -p0 -b .rpm
-#find . -name \*.rpm -delete
+find . -name \*.rpm -delete
 
 mv LICENSE.md LICENSE
 
@@ -185,6 +185,9 @@ exit $ret
 
 
 %changelog
+* Fri Mar 27 2020 Remi Collet <remi@remirepo.net> - 1.0.2-1
+- update to 1.0.2
+
 * Thu Feb 13 2020 Remi Collet <remi@remirepo.net> - 1.0.1-5
 - raise dependency on fedora/autoloader 1.0.1
 - clean autoloader
-- 
cgit