From 901b404e8a1b44adc65122330eedbeab6f8664d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 13 May 2019 10:47:47 +0200
Subject: v1.4.1 from Fedora

---
 .gitignore                  |  7 +++++++
 composer.json               |  2 +-
 php-clue-stream-filter.spec | 18 ++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index f871053..834f2d4 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,6 @@
     },
     "autoload": {
         "psr-4": { "Clue\\StreamFilter\\": "src/" },
-        "files": [ "src/functions.php" ]
+        "files": [ "src/functions_include.php" ]
     }
 }
diff --git a/php-clue-stream-filter.spec b/php-clue-stream-filter.spec
index bb6247c..1d8dcde 100644
--- a/php-clue-stream-filter.spec
+++ b/php-clue-stream-filter.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-clue-stream-filter
 #
-# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
 
 %global github_owner     clue
 %global github_name      php-stream-filter
-%global github_version   1.4.0
-%global github_commit    d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0
+%global github_version   1.4.1
+%global github_commit    5a58cc30a8bd6a4eb8f856adf61dd3e013f53f71
 
 %global composer_vendor  clue
 %global composer_project stream-filter
@@ -31,7 +31,6 @@ Version:       %{github_version}
 Release:       1%{?github_release}%{?dist}
 Summary:       A simple and modern approach to stream filtering in PHP
 
-Group:         Development/Libraries
 License:       MIT
 URL:           https://github.com/%{github_owner}/%{github_name}
 Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
@@ -42,7 +41,7 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-## phpcompatinfo (computed from version 1.4.0)
+## phpcompatinfo (computed from version 1.4.1)
 BuildRequires: php-reflection
 BuildRequires: php-spl
 BuildRequires: php-zlib
@@ -52,7 +51,7 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-# phpcompatinfo (computed from version 1.4.0)
+# phpcompatinfo (computed from version 1.4.1)
 Requires:      php-reflection
 Requires:      php-spl
 # Autoloader
@@ -84,7 +83,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Clue\\StreamFilter\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required(array(
-    __DIR__.'/functions.php',
+    __DIR__.'/functions_include.php',
 ));
 AUTOLOAD
 
@@ -98,7 +97,7 @@ cp -rp src %{buildroot}%{phpdir}/Clue/StreamFilter
 %if %{with_tests}
 : Upstream tests
 RETURN_CODE=0
-for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72; do
+for PHP_EXEC in php %{?rhel:php54 php55 php56 php70} php71 php72php73 php74; do
     if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC %{_bindir}/phpunit --verbose \
             --bootstrap %{buildroot}%{phpdir}/Clue/StreamFilter/autoload.php \
@@ -121,6 +120,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri May 10 2019 Shawn Iwinski <shawn@iwin.ski> - 1.4.1-1
+- Update to 1.4.1 (RHBZ #1698047)
+
 * Thu Aug 31 2017 Shawn Iwinski <shawn@iwin.ski> - 1.4.0-1
 - Update to 1.4.0 (RHBZ #1482951)
 - Merge default and SCL tests (normailzed to what other specs use)
-- 
cgit