From b18ea293d8150ac6d24124999b9eb7668dfbb08c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:32:19 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-splitbrain-slika.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index a2c47d4..9433270 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -3,7 +3,7 @@ Name: php-%{author}-%{project} Version: 1.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Image handling library for PHP License: MIT @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0a95a5c492824840cebdd5b03e34e7fed79d4428 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:20:03 +0000 Subject: [PATCH 2/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-splitbrain-slika.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index 9433270..c33e139 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -3,7 +3,7 @@ Name: php-%{author}-%{project} Version: 1.0.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Image handling library for PHP License: MIT @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.0.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b3a6d92c15d2ac7b980c23bb3f29c1df1b3385ca Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sat, 27 Jan 2024 23:18:15 +0100 Subject: [PATCH 3/9] Update to v1.0.6 --- .gitignore | 1 + 0000-php-8.3.0-compat.patch | 22 ++++++++++++++++++++++ php-splitbrain-slika.spec | 15 ++++++++++----- sources | 2 +- 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 0000-php-8.3.0-compat.patch diff --git a/.gitignore b/.gitignore index b28cfe2..6af60da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /slika-1.0.5.zip +/slika-1.0.6.zip diff --git a/0000-php-8.3.0-compat.patch b/0000-php-8.3.0-compat.patch new file mode 100644 index 0000000..4c9b166 --- /dev/null +++ b/0000-php-8.3.0-compat.patch @@ -0,0 +1,22 @@ +diff -r -U4 slika-1.0.6--orig/src/GdAdapter.php slika-1.0.6--patched/src/GdAdapter.php +--- slika-1.0.6--orig/src/GdAdapter.php 2024-01-27 23:07:51.000000000 +0100 ++++ slika-1.0.6--patched/src/GdAdapter.php 2024-01-27 23:12:05.855089820 +0100 +@@ -89,15 +89,15 @@ + $transparency = imagecolorallocatealpha($this->image, 0, 0, 0, 127); + + // rotate + if (in_array($orientation, [3, 4])) { +- $image = imagerotate($this->image, 180, $transparency, 1); ++ $image = imagerotate($this->image, 180, $transparency); + } + if (in_array($orientation, [5, 6])) { +- $image = imagerotate($this->image, -90, $transparency, 1); ++ $image = imagerotate($this->image, -90, $transparency); + list($this->width, $this->height) = [$this->height, $this->width]; + } elseif (in_array($orientation, [7, 8])) { +- $image = imagerotate($this->image, 90, $transparency, 1); ++ $image = imagerotate($this->image, 90, $transparency); + list($this->width, $this->height) = [$this->height, $this->width]; + } + /** @var resource $image is now defined */ + diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index c33e139..f1d72e2 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -2,8 +2,8 @@ %global project slika Name: php-%{author}-%{project} -Version: 1.0.5 -Release: 7%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: Image handling library for PHP License: MIT @@ -19,11 +19,13 @@ URL: https://github.com/%{author}/%{project} Source0: %{project}-%{version}.zip Source99: slika-get-archive.sh +Patch0: 0000-php-8.3.0-compat.patch + BuildArch: noarch %global with_tests 1 -BuildRequires: php(language) >= 5.5.0 +BuildRequires: php(language) >= 7.0.0 BuildRequires: php-fedora-autoloader-devel %if 0%{with_tests} @@ -33,7 +35,7 @@ BuildRequires: php-pcre BuildRequires: phpunit8 %endif -Requires: php(language) >= 5.5.0 +Requires: php(language) >= 7.0.0 Requires: php-pcre Requires: php-composer(fedora/autoloader) @@ -59,7 +61,7 @@ Autoloader: %{pkgdir}/autoload.php %prep -%setup -q -n %{project}-%{version} +%autosetup -p1 -n %{project}-%{version} # Exclude the tests from the composer file sed -e '/"splitbrain\\\\slika\\\\tests\\\\":/d' -i composer.json @@ -103,6 +105,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Sat Jan 27 2024 Artur Frenszek-Iwicki - 1.0.6-1 +- Update to v1.0.6 + * Thu Jan 25 2024 Fedora Release Engineering - 1.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 842ab60..74fe0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slika-1.0.5.zip) = 445df981a0c6532f1bad90a5dd50dbcb9371c9611b8c64091fca197f248eb0347acabbc543636027b381690801f1441392457398ff066f9140e4a4842b8fefc4 +SHA512 (slika-1.0.6.zip) = 475d4def6f89a0de7ab68e460e9f91f9e356bb37e592ee4aa175479b5c1f1ebca91753d27b229687a921acd603f5597eee83fabf833ed3d71fdc65440783e2a6 From 3f26ba2134326a1336bd8259bec15c2ad5eb5acf Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sat, 27 Jan 2024 23:18:15 +0100 Subject: [PATCH 4/9] Update to v1.0.6 --- .gitignore | 1 + php-splitbrain-slika.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b28cfe2..6af60da 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /slika-1.0.5.zip +/slika-1.0.6.zip diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index a2c47d4..2317ed1 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -2,8 +2,8 @@ %global project slika Name: php-%{author}-%{project} -Version: 1.0.5 -Release: 5%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: Image handling library for PHP License: MIT @@ -23,7 +23,7 @@ BuildArch: noarch %global with_tests 1 -BuildRequires: php(language) >= 5.5.0 +BuildRequires: php(language) >= 7.0.0 BuildRequires: php-fedora-autoloader-devel %if 0%{with_tests} @@ -33,7 +33,7 @@ BuildRequires: php-pcre BuildRequires: phpunit8 %endif -Requires: php(language) >= 5.5.0 +Requires: php(language) >= 7.0.0 Requires: php-pcre Requires: php-composer(fedora/autoloader) @@ -59,7 +59,7 @@ Autoloader: %{pkgdir}/autoload.php %prep -%setup -q -n %{project}-%{version} +%autosetup -p1 -n %{project}-%{version} # Exclude the tests from the composer file sed -e '/"splitbrain\\\\slika\\\\tests\\\\":/d' -i composer.json @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Sat Jan 27 2024 Artur Frenszek-Iwicki - 1.0.6-1 +- Update to v1.0.6 + * Fri Jul 21 2023 Fedora Release Engineering - 1.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 842ab60..74fe0d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slika-1.0.5.zip) = 445df981a0c6532f1bad90a5dd50dbcb9371c9611b8c64091fca197f248eb0347acabbc543636027b381690801f1441392457398ff066f9140e4a4842b8fefc4 +SHA512 (slika-1.0.6.zip) = 475d4def6f89a0de7ab68e460e9f91f9e356bb37e592ee4aa175479b5c1f1ebca91753d27b229687a921acd603f5597eee83fabf833ed3d71fdc65440783e2a6 From 0b5bc04bd24e0a8f923271047c1d1325d0c88062 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 30 Jan 2024 09:59:31 +0100 Subject: [PATCH 5/9] Update to v1.0.7 --- .gitignore | 1 + 0000-php-8.3.0-compat.patch | 22 ---------------------- php-splitbrain-slika.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 0000-php-8.3.0-compat.patch diff --git a/.gitignore b/.gitignore index 6af60da..e81c9a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /slika-1.0.5.zip /slika-1.0.6.zip +/slika-1.0.7.zip diff --git a/0000-php-8.3.0-compat.patch b/0000-php-8.3.0-compat.patch deleted file mode 100644 index 4c9b166..0000000 --- a/0000-php-8.3.0-compat.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r -U4 slika-1.0.6--orig/src/GdAdapter.php slika-1.0.6--patched/src/GdAdapter.php ---- slika-1.0.6--orig/src/GdAdapter.php 2024-01-27 23:07:51.000000000 +0100 -+++ slika-1.0.6--patched/src/GdAdapter.php 2024-01-27 23:12:05.855089820 +0100 -@@ -89,15 +89,15 @@ - $transparency = imagecolorallocatealpha($this->image, 0, 0, 0, 127); - - // rotate - if (in_array($orientation, [3, 4])) { -- $image = imagerotate($this->image, 180, $transparency, 1); -+ $image = imagerotate($this->image, 180, $transparency); - } - if (in_array($orientation, [5, 6])) { -- $image = imagerotate($this->image, -90, $transparency, 1); -+ $image = imagerotate($this->image, -90, $transparency); - list($this->width, $this->height) = [$this->height, $this->width]; - } elseif (in_array($orientation, [7, 8])) { -- $image = imagerotate($this->image, 90, $transparency, 1); -+ $image = imagerotate($this->image, 90, $transparency); - list($this->width, $this->height) = [$this->height, $this->width]; - } - /** @var resource $image is now defined */ - diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index f1d72e2..41495c6 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -2,7 +2,7 @@ %global project slika Name: php-%{author}-%{project} -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: Image handling library for PHP @@ -19,8 +19,6 @@ URL: https://github.com/%{author}/%{project} Source0: %{project}-%{version}.zip Source99: slika-get-archive.sh -Patch0: 0000-php-8.3.0-compat.patch - BuildArch: noarch %global with_tests 1 @@ -105,6 +103,10 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Tue Jan 30 2024 Artur Frenszek-Iwicki - 1.0.7-1 +- Update to v1.0.7 +- Drop Patch0 (fix PHP 8.3.0 compatibility - merged upstream) + * Sat Jan 27 2024 Artur Frenszek-Iwicki - 1.0.6-1 - Update to v1.0.6 diff --git a/sources b/sources index 74fe0d7..ac4fe1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slika-1.0.6.zip) = 475d4def6f89a0de7ab68e460e9f91f9e356bb37e592ee4aa175479b5c1f1ebca91753d27b229687a921acd603f5597eee83fabf833ed3d71fdc65440783e2a6 +SHA512 (slika-1.0.7.zip) = 382f4c587819cf0c45333d622f12eb22e008528ca616095cd8a6c8e8babb64f0f14cac88546fe9905973af4b78123044f41844e17c9d06615cf21f8cf96cc314 From 208d39ee238b8b57f7ed2b876468aa4e1da7af75 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 30 Jan 2024 10:10:10 +0100 Subject: [PATCH 6/9] Update to v1.0.7 --- .gitignore | 1 + php-splitbrain-slika.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6af60da..e81c9a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /slika-1.0.5.zip /slika-1.0.6.zip +/slika-1.0.7.zip diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index 2317ed1..64d034b 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -2,7 +2,7 @@ %global project slika Name: php-%{author}-%{project} -Version: 1.0.6 +Version: 1.0.7 Release: 1%{?dist} Summary: Image handling library for PHP @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Tue Jan 30 2024 Artur Frenszek-Iwicki - 1.0.7-1 +- Update to v1.0.7 + * Sat Jan 27 2024 Artur Frenszek-Iwicki - 1.0.6-1 - Update to v1.0.6 diff --git a/sources b/sources index 74fe0d7..ac4fe1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slika-1.0.6.zip) = 475d4def6f89a0de7ab68e460e9f91f9e356bb37e592ee4aa175479b5c1f1ebca91753d27b229687a921acd603f5597eee83fabf833ed3d71fdc65440783e2a6 +SHA512 (slika-1.0.7.zip) = 382f4c587819cf0c45333d622f12eb22e008528ca616095cd8a6c8e8babb64f0f14cac88546fe9905973af4b78123044f41844e17c9d06615cf21f8cf96cc314 From b1180e55dc13fd8f29e4c31446f6326334ef1b2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:35:36 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-splitbrain-slika.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index 41495c6..fa48814 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -3,7 +3,7 @@ Name: php-%{author}-%{project} Version: 1.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Image handling library for PHP License: MIT @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Artur Frenszek-Iwicki - 1.0.7-1 - Update to v1.0.7 - Drop Patch0 (fix PHP 8.3.0 compatibility - merged upstream) From 0a3a00cde4c6aaa2527119671d3b92b98c2ef18e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:53:44 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-splitbrain-slika.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index fa48814..ccc4ec5 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -3,7 +3,7 @@ Name: php-%{author}-%{project} Version: 1.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Image handling library for PHP License: MIT @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 161c46c269e7570b8f68648351654e64290def0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:38:54 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-splitbrain-slika.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-splitbrain-slika.spec b/php-splitbrain-slika.spec index ccc4ec5..bd4f071 100644 --- a/php-splitbrain-slika.spec +++ b/php-splitbrain-slika.spec @@ -3,7 +3,7 @@ Name: php-%{author}-%{project} Version: 1.0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Image handling library for PHP License: MIT @@ -103,6 +103,9 @@ phpunit8 --verbose --bootstrap ./bootstrap.php %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 1.0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild