From 48647fce6816db3ec78ed398e6c2ed5af311bc09 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 9 Apr 2020 08:33:08 +0200
Subject: update to 0.7.2 raise dependency on PHP 5.6 switch to classmap
 autoloader

---
 .gitignore               |  8 ++++++++
 composer.json            | 28 ++++++++++++++++------------
 php-icewind-streams.spec | 40 +++++++++++++++++++---------------------
 3 files changed, 43 insertions(+), 33 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index f2f3e0f..78fecce 100644
--- a/composer.json
+++ b/composer.json
@@ -1,24 +1,28 @@
 {
-	"name"             : "icewind/streams",
-	"description"      : "A set of generic stream wrappers",
-	"license"          : "MIT",
-	"authors"          : [
+	"name": "icewind/streams",
+	"description": "A set of generic stream wrappers",
+	"license": "MIT",
+	"authors": [
 		{
-			"name" : "Robin Appelman",
+			"name": "Robin Appelman",
 			"email": "icewind@owncloud.com"
 		}
 	],
-	"require"          : {
-		"php": ">=5.3"
+	"require": {
+		"php": ">=5.6"
 	},
-	"require-dev"      : {
-		"satooshi/php-coveralls": "v1.0.0",
-		"phpunit/phpunit": "^4.8"
+	"require-dev": {
+		"php-coveralls/php-coveralls": "v2.1.0",
+		"phpunit/phpunit": "^5.7"
 	},
-	"autoload"         : {
+	"autoload": {
 		"psr-4": {
-			"Icewind\\Streams\\Tests\\": "tests/",
 			"Icewind\\Streams\\": "src/"
 		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Icewind\\Streams\\Tests\\": "tests/"
+		}
 	}
 }
diff --git a/php-icewind-streams.spec b/php-icewind-streams.spec
index a2052d3..8d0c34b 100644
--- a/php-icewind-streams.spec
+++ b/php-icewind-streams.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-icewind-streams
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # Github information
-%global gh_commit    4db3ed6c366e90b958d00e1d4c6360a9b39b2121
+%global gh_commit    77d750ccc654c0eda4a41fedb2dbd71053755790
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     icewind1991
 %global gh_project   Streams
@@ -19,7 +19,7 @@
 %global ns_name      Streams
 
 Name:           php-%{pk_vendor}-%{pk_name}
-Version:        0.7.1
+Version:        0.7.2
 Release:        1%{?dist}
 Summary:        A set of generic stream wrappers
 
@@ -29,19 +29,20 @@ Source0:        %{url}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.g
 
 BuildArch:      noarch
 # For tests
-BuildRequires:  php(language) >= 5.3
+BuildRequires:  php(language) >= 5.6
 # From composer.json, "require-dev": {
-#		"satooshi/php-coveralls": "v1.0.0",
-#		"phpunit/phpunit": "^4.8"
-BuildRequires:  php-composer(phpunit/phpunit) >= 4.8
+#		"satooshi/php-coveralls": "v2.1.0",
+#		"phpunit/phpunit": "^5.7"
+BuildRequires:  php-composer(phpunit/phpunit) >= 5.7
 BuildRequires:  php-composer(theseer/autoload)
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
 #      "php": ">=5.3"
-Requires:       php(language) >= 5.3
-# From phpcompatinfo report for version 0.2.0
+Requires:       php(language) >= 5.6
+# From phpcompatinfo report for version 0.7.2
+Requires:       php-hash
 Requires:       php-spl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -58,18 +59,10 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_name}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-cat << 'EOF' | tee src/autoload.php
-<?php
-/* Autoloader for icewind/streams and its dependencies */
-
-require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('Icewind\\Streams\\', __DIR__);
-EOF
-
-
 
 %build
-# Empty build section, most likely nothing required.
+: Generate classmap autoloader
+%{_bindir}/phpab --template fedora --output src/autoload.php src
 
 
 %install
@@ -87,7 +80,7 @@ echo "require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_name}/autoload.php'
 
 : Run the test suite
 ret=0
-for cmd in php php56 php70 php71 php72 php73; do
+for cmd in php php56 php70 php71 php72 php73 php74; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit || ret=1
   fi
@@ -105,6 +98,11 @@ exit $ret
 
 
 %changelog
+* Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 0.7.2-1
+- update to 0.7.2
+- raise dependency on PHP 5.6
+- switch to classmap autoloader
+
 * Mon Feb 18 2019 Remi Collet <remi@remirepo.net> - 0.7.1-1
 - update to 0.7.1
 
-- 
cgit