From a88b9ced22172ee5863f9b81751042102ab116f2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Mar 2017 07:33:09 +0200 Subject: [PATCH 1/2] Update to 1.9.14 handle all classes in autoloader (cherry picked from commit 22084a99921cd625c23c4c4d1e1d043de0f6cecc) --- .gitignore | 1 + php-getid3.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7ef4c63..19f1043 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ getid3-2.0.0b5.zip /getID3-1.9.8-20140511.zip /getID3-1.9.12.zip /getID3-1.9.13-b9a8564.tar.gz +/getID3-1.9.14-30bd114.tar.gz diff --git a/php-getid3.spec b/php-getid3.spec index f90561b..0caeb4a 100644 --- a/php-getid3.spec +++ b/php-getid3.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit b9a8564e56bdcc294dc7ade32a7f67885bed3778 +%global gh_commit 30bd11473b0eef6f1b47866ef7ab0a557917fc21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner JamesHeinrich %global gh_project getID3 @@ -14,7 +14,7 @@ %global pk_project getid3 Name: php-%{pk_project} -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Epoch: 1 License: LGPLv3+ @@ -61,8 +61,8 @@ Autoloader: %{_datadir}/php/getid3/autoload.php %build # From composer.json, "autoload": { -# "classmap": ["getid3/getid3.php"] -%{_bindir}/phpab --template fedora --output getid3/autoload.php getid3/getid3.php +# "classmap": ["getid3/"] +%{_bindir}/phpab --template fedora --output getid3/autoload.php getid3 %install @@ -75,7 +75,9 @@ cp -a getid3 %{buildroot}%{_datadir}/php/ php -r ' require "%{buildroot}%{_datadir}/php/getid3/autoload.php"; $ok = class_exists("getID3"); -echo "Autoload " . ($ok ? "Ok\n" : "fails\n"); +echo "Autoload: " . ($ok ? "Ok\n" : "fails\n"); +echo "Version: " . getID3::VERSION . "\n"; +$ok = ($ok && strpos(getID3::VERSION, "%{version}") !== false); exit ($ok ? 0 : 1); ' @@ -89,6 +91,10 @@ exit ($ok ? 0 : 1); %changelog +* Tue Mar 28 2017 Remi Collet - 1:1.9.14-1 +- Update to 1.9.14 +- handle all classes in autoloader + * Thu Dec 15 2016 Remi Collet - 1:1.9.13-1 - update to 1.9.13 - use new URL http://www.getid3.org/ diff --git a/sources b/sources index 1724af0..83e577e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (getID3-1.9.13-b9a8564.tar.gz) = 6286bdbbb790c0deed777490ba84731949a541ab302217c742ba4d0c15247f0844651337da2c7f67f7098c4929dd45eaceb9a203bae9a9d07b148c7803e4bcb5 +SHA512 (getID3-1.9.14-30bd114.tar.gz) = f70618a58b56e65d76c693440ae432dde1e3eede2e38241ca5f8172665a34e83caab57dc7715f140615a31622535cec6a56a73228f720e831f136016d8a9d92d From ae3e34bf98ce4f32187f51f30fe2b99607d20efc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Oct 2017 14:17:07 +0100 Subject: [PATCH 2/2] v1.9.15 (cherry picked from commit bf936d8b3afa6e4b782167c3c0b2fc1899fa68fe) (cherry picked from commit ad3230823a6e2e5fc8176b13b469ad31eac81d8a) --- .gitignore | 1 + php-getid3.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 19f1043..86665fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ getid3-2.0.0b5.zip /getID3-1.9.12.zip /getID3-1.9.13-b9a8564.tar.gz /getID3-1.9.14-30bd114.tar.gz +/getID3-1.9.15-df9b441.tar.gz diff --git a/php-getid3.spec b/php-getid3.spec index 0caeb4a..a8f53d6 100644 --- a/php-getid3.spec +++ b/php-getid3.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit 30bd11473b0eef6f1b47866ef7ab0a557917fc21 +%global gh_commit df9b441e547da1018b1be0e239bee095c9962c96 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner JamesHeinrich %global gh_project getID3 @@ -14,7 +14,7 @@ %global pk_project getid3 Name: php-%{pk_project} -Version: 1.9.14 +Version: 1.9.15 Release: 1%{?dist} Epoch: 1 License: LGPLv3+ @@ -66,7 +66,6 @@ Autoloader: %{_datadir}/php/getid3/autoload.php %install - mkdir -p %{buildroot}%{_datadir}/php cp -a getid3 %{buildroot}%{_datadir}/php/ @@ -91,6 +90,9 @@ exit ($ok ? 0 : 1); %changelog +* Mon Oct 30 2017 Remi Collet - 1.9.15-1 +- Update to 1.9.15 + * Tue Mar 28 2017 Remi Collet - 1:1.9.14-1 - Update to 1.9.14 - handle all classes in autoloader diff --git a/sources b/sources index 83e577e..3a364e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (getID3-1.9.14-30bd114.tar.gz) = f70618a58b56e65d76c693440ae432dde1e3eede2e38241ca5f8172665a34e83caab57dc7715f140615a31622535cec6a56a73228f720e831f136016d8a9d92d +SHA512 (getID3-1.9.15-df9b441.tar.gz) = 12de3d093b2e04af09eca8cec6ef1de565197c70ea7a09737b0d2ee4887f4aa9876ea9b8ed62ca1a6c029c24affad7a8f41e2ba798a4b67fcb573ecce5ee62aa