From 1f2f6de71b0520c58330cbb20d27ebe9934d421d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 8 Feb 2019 10:06:15 +0100 Subject: [PATCH 1/2] update to 1.9.17 add weak dependencies on suggested extension (cherry picked from commit 6dd230c5e59d864d5abcd9056284c85416ef65fd) --- .gitignore | 1 + php-getid3.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4260b28..9906a50 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ getid3-2.0.0b5.zip /getID3-1.9.14-30bd114.tar.gz /getID3-1.9.15-df9b441.tar.gz /getID3-1.9.16-7aec0d4.tar.gz +/getID3-1.9.17-d2e45f2.tar.gz diff --git a/php-getid3.spec b/php-getid3.spec index 28005e9..ebe7fc5 100644 --- a/php-getid3.spec +++ b/php-getid3.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit 7aec0d4f5fc156612f71e415d07996aee6ab8d82 +%global gh_commit d2e45f2c4f75cc7443e158757ad2d678e318685d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner JamesHeinrich %global gh_project getID3 @@ -14,13 +14,12 @@ %global pk_project getid3 Name: php-%{pk_project} -Version: 1.9.16 +Version: 1.9.17 Release: 1%{?dist} Epoch: 1 License: LGPLv3+ Summary: The PHP media file parser -Group: Development/Libraries -URL: http://www.getid3.org/ +URL: https://www.getid3.org/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildArch: noarch @@ -37,11 +36,17 @@ Requires: php-exif Requires: php-filter Requires: php-gd Requires: php-iconv +Requires: php-json Requires: php-libxml Requires: php-mbstring Requires: php-pcre Requires: php-xml -# Optional: dba, mysql, mysqli, sqlite3, rar +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Suggests: php-dba +Suggests: php-mysqli +Suggests: php-rar +Suggests: php-sqlite3 +%endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -92,6 +97,10 @@ exit ($ok ? 0 : 1); %changelog +* Fri Feb 8 2019 Remi Collet - 1.9.17-1 +- update to 1.9.17 +- add weak dependencies on suggested extension + * Thu Oct 18 2018 Remi Collet - 1.9.16-1 - update to 1.9.16 diff --git a/sources b/sources index 19bf152..863f268 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (getID3-1.9.16-7aec0d4.tar.gz) = ed17179d79634da5dfc514fb8f563f51884629e502b6c3ad4e21a6ec2a930600030a2dcaa15187fa4f0564d78855b70ef175cefb467aee57d7903bfec2365199 +SHA512 (getID3-1.9.17-d2e45f2.tar.gz) = 0824840d161e80f597e36d85cd6da4f74181d0b78d0ae1015ea510ec30bbb943919428f981c9dadb684813e93cf10d3137105a32ca710dee908eb7b0cbf79165 From b71e28c69245bb6ba8cbc45e04f69356919a0cf6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Sep 2019 10:02:41 +0200 Subject: [PATCH 2/2] update to 1.9.18 use git snapshot for sources (cherry picked from commit e8a0daec36333875c4a31d9072dd4404866b4cc2) (cherry picked from commit 143709ca2ab62d09b9b6a789677f0ca53ad1619d) --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ php-getid3.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 9906a50..3f29c62 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ getid3-2.0.0b5.zip /getID3-1.9.15-df9b441.tar.gz /getID3-1.9.16-7aec0d4.tar.gz /getID3-1.9.17-d2e45f2.tar.gz +/php-getid3-1.9.18-0723b77.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..7d752c6 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" + +echo "Cloning..." +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." + diff --git a/php-getid3.spec b/php-getid3.spec index ebe7fc5..afa2144 100644 --- a/php-getid3.spec +++ b/php-getid3.spec @@ -6,7 +6,7 @@ # # Please preserve changelog entries # -%global gh_commit d2e45f2c4f75cc7443e158757ad2d678e318685d +%global gh_commit 0723b77cafe9278618cfb6bc91b75e73705d3de8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner JamesHeinrich %global gh_project getID3 @@ -14,13 +14,14 @@ %global pk_project getid3 Name: php-%{pk_project} -Version: 1.9.17 +Version: 1.9.18 Release: 1%{?dist} Epoch: 1 License: LGPLv3+ Summary: The PHP media file parser URL: https://www.getid3.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -89,7 +90,6 @@ exit ($ok ? 0 : 1); %files -%{!?_licensedir:%global license %%doc} %license licenses license.txt %doc changelog.txt dependencies.txt readme.txt structure.txt demos %doc composer.json @@ -97,6 +97,10 @@ exit ($ok ? 0 : 1); %changelog +* Tue Sep 17 2019 Remi Collet - 1.9.18-1 +- update to 1.9.18 +- use git snapshot for sources + * Fri Feb 8 2019 Remi Collet - 1.9.17-1 - update to 1.9.17 - add weak dependencies on suggested extension diff --git a/sources b/sources index 863f268..dee7b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (getID3-1.9.17-d2e45f2.tar.gz) = 0824840d161e80f597e36d85cd6da4f74181d0b78d0ae1015ea510ec30bbb943919428f981c9dadb684813e93cf10d3137105a32ca710dee908eb7b0cbf79165 +SHA512 (php-getid3-1.9.18-0723b77.tgz) = 984668a1ccbb2ba48685cddada720a95477e75ac66207acfead73d5d9bf50692a0e502f2c6fe9a0ec8e17caefb436a5c9227cd7664762e379321d46b986cfbb4