From 800c6472a84e24ef8438e3337caeefe7670458fc Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Jun 2015 14:32:25 +0000
Subject: [PATCH 01/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 3287845..9906c21 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -11,7 +11,7 @@
 
 Name:           php-%{packagist_owner}-%{packagist_name}
 Version:        %{github_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ cp -pr src/* %{buildroot}%{_datadir}/php/%{psr4_namespace}
 
 
 %changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Apr 25 2015 Adam Williamson <awilliam@redhat.com> - 2.0.2-1
 - new release 2.0.2
 

From ce9643b312293354097f14bfe62316020d519df9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 4 Feb 2016 17:25:38 +0000
Subject: [PATCH 02/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 9906c21..7c4d5e7 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -11,7 +11,7 @@
 
 Name:           php-%{packagist_owner}-%{packagist_name}
 Version:        %{github_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@ cp -pr src/* %{buildroot}%{_datadir}/php/%{psr4_namespace}
 
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From b5e6c8c492e848d0f542b424b0369a057f23bdeb Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <siwinski@redhat.com>
Date: Mon, 10 Oct 2016 07:50:55 -0400
Subject: [PATCH 03/27] Update to 2.0.5 (RHBZ #1383300, #1383302)

- Add spec license
---
 .gitignore                           |  1 +
 php-patchwork-jsqueeze-get-source.sh | 69 ++++++++++++++++++++
 php-patchwork-jsqueeze.spec          | 94 ++++++++++++++++++++--------
 sources                              |  2 +-
 4 files changed, 140 insertions(+), 26 deletions(-)
 create mode 100755 php-patchwork-jsqueeze-get-source.sh

diff --git a/.gitignore b/.gitignore
index c103199..da7ddfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jsqueeze-70a8167daf0e2d5522d5d77a11e3a7d6753683ce.tar.gz
 /jsqueeze-2e581762884cfd035d9b148794ef2a4ab2c3b893.tar.gz
+/php-patchwork-jsqueeze-2.0.5-693d64850eab2ce6a7c8f7cf547e1ab46e69d542.tar.gz
diff --git a/php-patchwork-jsqueeze-get-source.sh b/php-patchwork-jsqueeze-get-source.sh
new file mode 100755
index 0000000..ba71f5d
--- /dev/null
+++ b/php-patchwork-jsqueeze-get-source.sh
@@ -0,0 +1,69 @@
+#/bin/sh
+
+GIT=`which git`
+RPM=`which rpm`
+
+if [ -z "$GIT" ]
+then
+    echo "ERROR: 'git' command not found" 1>&2
+    exit 1
+elif [ -z "$RPM" ]
+then
+    echo "ERROR: 'rpm' command not found" 1>&2
+    exit 1
+fi
+
+function print {
+    echo -e "\e[0;33m>>>>> ${1}\e[0m"
+}
+
+if [ -x "$1" ]
+then
+    SPEC=$1
+else
+    SPEC=`ls *.spec | head -1`
+fi
+
+NAME=`echo $SPEC | sed 's#\.spec##'`
+VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'`
+
+print "SPEC = $SPEC"
+print "NAME = $NAME"
+
+GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'`
+GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'`
+GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'`
+GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME}
+GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'`
+
+print "GIT_OWNER = $GIT_OWNER"
+print "GIT_NAME = $GIT_NAME"
+print "GIT_COMMIT = $GIT_COMMIT"
+print "GIT_REPO = $GIT_REPO"
+print "GIT_DIR = $GIT_DIR"
+
+TEMP_DIR=$(mktemp --dir)
+
+pushd $TEMP_DIR
+    print "Cloning git repo..."
+    $GIT clone $GIT_REPO
+
+    pushd $GIT_DIR
+        print "Checking out commit..."
+        $GIT checkout $GIT_COMMIT
+    popd
+
+    TAR_DIR=${GIT_NAME}-${GIT_COMMIT}
+    print "TAR_DIR = $TAR_DIR"
+
+    mv $GIT_DIR $TAR_DIR
+
+    TAR_FILE=`$RPM --eval='%{_sourcedir}'`/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
+    print "TAR_FILE = $TAR_FILE"
+
+    [ -e $TAR_FILE ] && rm -f $TAR_FILE
+    tar --exclude-vcs -czf $TAR_FILE $TAR_DIR
+    chmod 0644 $TAR_FILE
+popd
+
+rm -rf $TEMP_DIR
diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 7c4d5e7..766cce5 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -1,38 +1,67 @@
-%global github_owner    tchwork
-%global github_name     jsqueeze
-%global github_version  2.0.2
-%global github_commit   2e581762884cfd035d9b148794ef2a4ab2c3b893
-%global packagist_owner patchwork
-%global packagist_name  jsqueeze
-%global psr4_namespace  Patchwork
+#
+# Fedora spec file for php-patchwork-jsqueeze
+#
+# Copyright (c) 2016 Adam Williamson <awilliam@redhat.com>
+#                    Shawn Iwinski <shawn@iwin.ski>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
 
-# phpci (uses namespacing)
-%global php_min_ver         5.3.0
+%global github_owner   tchwork
+%global github_name    jsqueeze
+%global github_version 2.0.5
+%global github_commit  693d64850eab2ce6a7c8f7cf547e1ab46e69d542
 
-Name:           php-%{packagist_owner}-%{packagist_name}
+%global composer_owner patchwork
+%global composer_name  jsqueeze
+
+# "php": ">=5.3.0"
+%global php_min_ver 5.3.0
+
+# Build using "--without tests" to disable tests
+%global with_tests 0%{!?_without_tests:1}
+
+%{!?phpdir:  %global phpdir  %{_datadir}/php}
+
+Name:           php-%{composer_owner}-%{composer_name}
 Version:        %{github_version}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
 License:        ASL 2.0 or GPLv2
 URL:            https://github.com/%{github_owner}/%{github_name}
-# Must use commit-based not tag-based github tarball:
-# https://fedoraproject.org/wiki/Packaging:SourceURL#Github
-Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
+
+# GitHub export does not include tests.
+# Run php-patchwork-jsqueeze.sh to create full source.
+Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
+Source1:       %{name}-get-source.sh
+
 BuildArch:      noarch
-# For tests
+# Autoloader
+BuildRequires: %{_bindir}/phpab
+# Tests
+%if %{with_tests}
+## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: %{_bindir}/phpunit
+BuildRequires: php-composer(phpunit/phpunit)
+## phpcompatinfo (computed from version 2.0.5)
+BuildRequires: php-pcre
+%endif
 
 Requires:       php(language) >= %{php_min_ver}
+# phpcompatinfo (computed from version 2.0.5)
 Requires:       php-pcre
 
-Provides:       php-composer(%{packagist_owner}/%{packagist_name}) = %{version}
+Provides:       php-composer(%{composer_owner}/%{composer_name}) = %{version}
 
 
 %description
 JSqueeze shrinks / compresses / minifies / mangles Javascript code.
+
 It's a single PHP class that is developed, maintained and thoroughly
 tested since 2003 on major JavaScript frameworks (e.g. jQuery).
 
@@ -42,33 +71,48 @@ semi-colons are missing.
 In term of compression ratio, it compares to YUI Compressor and
 UglifyJS.
 
+Autoloader: %{phpdir}/Patchwork/autoload-jsqueeze.php
+
 
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
 
 %build
-# Empty build section, nothing required
+: Generate autoloader
+%{_bindir}/phpab --output src/autoload-jsqueeze.php src/
+cat src/autoload-jsqueeze.php
 
 
 %install
-# use PSR-0 layout relative to _datadir/php
-mkdir -p %{buildroot}%{_datadir}/php/%{psr4_namespace}
-cp -pr src/* %{buildroot}%{_datadir}/php/%{psr4_namespace}
+mkdir -p %{buildroot}%{phpdir}/Patchwork
+cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %check
-%{_bindir}/phpunit
+%if %{with_tests}
+%{_bindir}/phpunit --verbose \
+    --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-jsqueeze.php
+%else
+: Tests skipped
+%endif
 
 
 %files
 %{!?_licensedir:%global license %%doc}
-%license LICENSE.ASL20 LICENSE.GPLv2
-%doc README.md composer.json
-%{_datadir}/php/%{psr4_namespace}
+%license LICENSE.*
+%doc *.md
+%doc composer.json
+%dir %{phpdir}/Patchwork
+     %{phpdir}/Patchwork/autoload-jsqueeze.php
+     %{phpdir}/Patchwork/JSqueeze.php
 
 
 %changelog
+* Mon Oct 10 2016 Shawn Iwinski <shawn@iwin.ski> - 2.0.5-1
+- Update to 2.0.5 (RHBZ #1383300, #1383302)
+- Add spec license
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 8e3aaea..026693c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c8e4c7782b91338a14a4e7512871521  jsqueeze-2e581762884cfd035d9b148794ef2a4ab2c3b893.tar.gz
+a2dd061e258734851f5fc20832bd096e  php-patchwork-jsqueeze-2.0.5-693d64850eab2ce6a7c8f7cf547e1ab46e69d542.tar.gz

From 7c60c21a41ca95f90c21743613a7ed728a617fa9 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <siwinski@redhat.com>
Date: Mon, 10 Oct 2016 07:53:48 -0400
Subject: [PATCH 04/27] Macro name change (no rebuild)

---
 php-patchwork-jsqueeze.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 766cce5..36ff81a 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -10,13 +10,13 @@
 # Please preserve changelog entries
 #
 
-%global github_owner   tchwork
-%global github_name    jsqueeze
-%global github_version 2.0.5
-%global github_commit  693d64850eab2ce6a7c8f7cf547e1ab46e69d542
+%global github_owner     tchwork
+%global github_name      jsqueeze
+%global github_version   2.0.5
+%global github_commit    693d64850eab2ce6a7c8f7cf547e1ab46e69d542
 
-%global composer_owner patchwork
-%global composer_name  jsqueeze
+%global composer_vendor  patchwork
+%global composer_project jsqueeze
 
 # "php": ">=5.3.0"
 %global php_min_ver 5.3.0
@@ -26,7 +26,7 @@
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
-Name:           php-%{composer_owner}-%{composer_name}
+Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
 Release:        1%{?dist}
 Summary:        Efficient JavaScript minification
@@ -56,7 +56,7 @@ Requires:       php(language) >= %{php_min_ver}
 # phpcompatinfo (computed from version 2.0.5)
 Requires:       php-pcre
 
-Provides:       php-composer(%{composer_owner}/%{composer_name}) = %{version}
+Provides:       php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
 
 %description

From 3106a32dbfa49f700cced37dc719953dc241c959 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Tue, 13 Dec 2016 08:40:59 -0500
Subject: [PATCH 05/27] Fix comment

---
 php-patchwork-jsqueeze.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 36ff81a..fa61a39 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -36,7 +36,7 @@ License:        ASL 2.0 or GPLv2
 URL:            https://github.com/%{github_owner}/%{github_name}
 
 # GitHub export does not include tests.
-# Run php-patchwork-jsqueeze.sh to create full source.
+# Run php-patchwork-jsqueeze-get-source.sh to create full source.
 Source0:       %{name}-%{github_version}-%{github_commit}.tar.gz
 Source1:       %{name}-get-source.sh
 

From 149c1a7ec37c769524341a7f9235253a1c391d8b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 06:51:48 +0000
Subject: [PATCH 06/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index fa61a39..498233b 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -109,6 +109,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Mon Oct 10 2016 Shawn Iwinski <shawn@iwin.ski> - 2.0.5-1
 - Update to 2.0.5 (RHBZ #1383300, #1383302)
 - Add spec license

From abb9a5d22891158f21334824db5634b67f50d680 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 07:56:10 +0000
Subject: [PATCH 07/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 498233b..9b33c78 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -109,6 +109,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From fa5e35d602b0b9468ec2ce8a4e863ecfd3b264d0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 03:58:29 +0000
Subject: [PATCH 08/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 9b33c78..385cd0d 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -109,6 +109,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From c03fed6ed2cbaf8d6d7440463ff4e97ce81456db Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 21:44:27 +0000
Subject: [PATCH 09/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 385cd0d..5ee5b7c 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Efficient JavaScript minification
 
 Group:          Development/Libraries
@@ -109,6 +109,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 95fb528f28d19003330d825502cd3936402f6707 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:11 +0100
Subject: [PATCH 10/27] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 php-patchwork-jsqueeze.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 5ee5b7c..39f6d7e 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,6 @@ Version:        %{github_version}
 Release:        5%{?dist}
 Summary:        Efficient JavaScript minification
 
-Group:          Development/Libraries
 License:        ASL 2.0 or GPLv2
 URL:            https://github.com/%{github_owner}/%{github_name}
 

From 8b62e58bf40017da9c4a1e5a145eed17b30c7c69 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 03:05:09 +0000
Subject: [PATCH 11/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 39f6d7e..d1e70da 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 191eaef4a4365ca4946d352906058eddf53d107e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 09:32:21 +0000
Subject: [PATCH 12/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index d1e70da..209e15d 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From dd2e42cc75b07b6a043f4d6615377d824264c53d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 07:59:02 +0000
Subject: [PATCH 13/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 209e15d..c6e8ffc 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 23c2bbb01147220b3b197aeea725d3efce6500d3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 21:36:23 +0000
Subject: [PATCH 14/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index c6e8ffc..5bafafb 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 584f30d960e780478c601a652ce1aa50f88c2637 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 07:14:35 +0000
Subject: [PATCH 15/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 5bafafb..8949b9c 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 55572be2b4b7b571cecdf1339d87cba8e3835b77 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 02:35:13 +0000
Subject: [PATCH 16/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 8949b9c..11466b5 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -108,6 +108,9 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 184c458a689e3dda74b86b07159fddacbfefb669 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 8 Dec 2021 09:19:09 +0100
Subject: [PATCH 17/27] disable test suite on EL

switch to phpunit9
---
 php-patchwork-jsqueeze.spec | 42 +++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 11466b5..e0d5fcd 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -1,8 +1,8 @@
 #
 # Fedora spec file for php-patchwork-jsqueeze
 #
-# Copyright (c) 2016 Adam Williamson <awilliam@redhat.com>
-#                    Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Adam Williamson <awilliam@redhat.com>
+#                         Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -21,14 +21,17 @@
 # "php": ">=5.3.0"
 %global php_min_ver 5.3.0
 
-# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%if 0%{?fedora}
+%bcond_without tests
+%else
+%bcond_with    tests
+%endif
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -43,10 +46,10 @@ BuildArch:      noarch
 # Autoloader
 BuildRequires: %{_bindir}/phpab
 # Tests
-%if %{with_tests}
+%if %{with tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit9
 ## phpcompatinfo (computed from version 2.0.5)
 BuildRequires: php-pcre
 %endif
@@ -89,16 +92,29 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %check
-%if %{with_tests}
-%{_bindir}/phpunit --verbose \
-    --bootstrap %{buildroot}%{phpdir}/Patchwork/autoload-jsqueeze.php
+%if %{with tests}
+: Create tests autoloader
+cat << 'EOF' | tee tests/bootstrap.php
+<?php
+require "%{buildroot}%{phpdir}/Patchwork/autoload-jsqueeze.php";
+class_alias("PHPUnit\\Framework\\TestCase", "PHPUnit_Framework_TestCase");
+EOF
+
+: Run upstream test suite
+ret=0
+for cmd in php php74 php80 php81
+do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit9 --verbose || ret=1
+  fi
+done
+exit $ret
 %else
 : Tests skipped
 %endif
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE.*
 %doc *.md
 %doc composer.json
@@ -108,6 +124,10 @@ cp -pr src/* %{buildroot}%{phpdir}/Patchwork/
 
 
 %changelog
+* Wed Dec  8 2021 Remi Collet <remi@fedoraproject.org> - 2.0.5-12
+- disable test suite on EL
+- switch to phpunit9
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 4d408c3b135df64bb31f3a3aabae53e0d0ab689a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 07:57:37 +0000
Subject: [PATCH 18/27] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index e0d5fcd..0bdbd33 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Dec  8 2021 Remi Collet <remi@fedoraproject.org> - 2.0.5-12
 - disable test suite on EL
 - switch to phpunit9

From 29fea68c3bbe4ed2f5989c721f0b49f42980526b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 13:51:32 +0000
Subject: [PATCH 19/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 0bdbd33..87a94ee 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 17ed557d92c9cc773c8bc3b8a070e43159d3d279 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 08:53:12 +0000
Subject: [PATCH 20/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 87a94ee..56e6888 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 80a715f60c9ad4373faf3e82740d39818d902d4c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 04:32:08 +0000
Subject: [PATCH 21/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 56e6888..16719d2 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 3f70fe027e0f65525e2a141dc9a9671685f37ee6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 21:01:27 +0000
Subject: [PATCH 22/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 16719d2..c0332bb 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From ed10ae0e3ae21f1249c2a2f9ac282578c438a86b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 22:48:10 +0000
Subject: [PATCH 23/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index c0332bb..6894f36 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From b331868a0776e4f61a174a83d3e97aab0e541ab8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 07:02:10 +0000
Subject: [PATCH 24/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 6894f36..46234fb 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Efficient JavaScript minification
 
 License:        ASL 2.0 or GPLv2
@@ -124,6 +124,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 6b276a17fb8f107a0132dcd28fdd5f0ed475122d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 7 Aug 2024 09:55:28 +0200
Subject: [PATCH 25/27] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 php-patchwork-jsqueeze.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index 46234fb..fa08e99 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,10 +31,11 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Efficient JavaScript minification
 
-License:        ASL 2.0 or GPLv2
+# Automatically converted from old format: ASL 2.0 or GPLv2 - review is highly recommended.
+License:        Apache-2.0 OR GPL-2.0-only
 URL:            https://github.com/%{github_owner}/%{github_name}
 
 # GitHub export does not include tests.
@@ -124,6 +125,9 @@ exit $ret
 
 
 %changelog
+* Wed Aug  7 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.5-20
+- convert license to SPDX
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From bd1ce861ddfbbeb64c00f0d052561eee77a31f9d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 09:13:37 +0000
Subject: [PATCH 26/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index fa08e99..dd3ec02 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Efficient JavaScript minification
 
 # Automatically converted from old format: ASL 2.0 or GPLv2 - review is highly recommended.
@@ -125,6 +125,9 @@ exit $ret
 
 
 %changelog
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Aug  7 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.5-20
 - convert license to SPDX
 

From c7a466a306921394e0709e7dd17dadd09b8f6b78 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 05:16:48 +0000
Subject: [PATCH 27/27] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 php-patchwork-jsqueeze.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-patchwork-jsqueeze.spec b/php-patchwork-jsqueeze.spec
index dd3ec02..a88ff4e 100644
--- a/php-patchwork-jsqueeze.spec
+++ b/php-patchwork-jsqueeze.spec
@@ -31,7 +31,7 @@
 
 Name:           php-%{composer_vendor}-%{composer_project}
 Version:        %{github_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Efficient JavaScript minification
 
 # Automatically converted from old format: ASL 2.0 or GPLv2 - review is highly recommended.
@@ -125,6 +125,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild