From 143709ca2ab62d09b9b6a789677f0ca53ad1619d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 17 Sep 2019 10:02:41 +0200
Subject: [PATCH 1/2] update to 1.9.18 use git snapshot for sources

(cherry picked from commit e8a0daec36333875c4a31d9072dd4404866b4cc2)
---
 .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 30b4668..2ba079a 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 <remi@remirepo.net> - 1.9.18-1
+- update to 1.9.18
+- use git snapshot for sources
+
 * Fri Feb  8 2019 Remi Collet <remi@remirepo.net> - 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

From 83f5735818baf60e4479691dcc61c0080b1537fe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 18 Dec 2019 12:03:52 +0100
Subject: [PATCH 2/2] v1.9.19

(cherry picked from commit 46229cd5d9e5a713e0409364cf5b87928c99e9ee)
---
 .gitignore      | 1 +
 php-getid3.spec | 7 +++++--
 sources         | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f29c62..97325d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ getid3-2.0.0b5.zip
 /getID3-1.9.16-7aec0d4.tar.gz
 /getID3-1.9.17-d2e45f2.tar.gz
 /php-getid3-1.9.18-0723b77.tgz
+/php-getid3-1.9.19-c6fd499.tgz
diff --git a/php-getid3.spec b/php-getid3.spec
index 2ba079a..1e955e1 100644
--- a/php-getid3.spec
+++ b/php-getid3.spec
@@ -6,7 +6,7 @@
 #
 # Please preserve changelog entries
 #
-%global gh_commit    0723b77cafe9278618cfb6bc91b75e73705d3de8
+%global gh_commit    c6fd499a690ae67eea2eec6b2edba5df13f60f6f
 %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.18
+Version:   1.9.19
 Release:   1%{?dist}
 Epoch:     1
 License:   LGPLv3+
@@ -97,6 +97,9 @@ exit ($ok ? 0 : 1);
 
 
 %changelog
+* Wed Dec 18 2019 Remi Collet <remi@remirepo.net> - 1.9.19-1
+- update to 1.9.19
+
 * Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 1.9.18-1
 - update to 1.9.18
 - use git snapshot for sources
diff --git a/sources b/sources
index dee7b69..d18d39b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-getid3-1.9.18-0723b77.tgz) = 984668a1ccbb2ba48685cddada720a95477e75ac66207acfead73d5d9bf50692a0e502f2c6fe9a0ec8e17caefb436a5c9227cd7664762e379321d46b986cfbb4
+SHA512 (php-getid3-1.9.19-c6fd499.tgz) = 282088c4dee149e8c10b1cb4ff50a3ee2861b537d954ad026f0b56bbbda2d0ac4208d7dcd44ee924e80b79abc7322712076ed78c3669a54b565ccfeaaa0e2e99