[libquicktime] Update to 1.2.4.112.20180804gitfff99cd from branch master

commit fb01f589eb42cef25e71748fcc4d5775f8bf3005 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Oct 5 06:02:38 2018 +0100 Update to 1.2.4.112.20180804gitfff99cd from branch master .gitignore | 1 + ChangeLog | 618 ------------------------------------------------- libquicktime.spec | 9 +- sources | 2 +- update_libquicktime.sh | 11 +- 5 files changed, 13 insertions(+), 628 deletions(-) --- diff --git a/.gitignore b/.gitignore index 850df18..8528cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libquicktime-1.2.4.tar.gz /libquicktime-1.2.4-4d451774b8.tar.gz /libquicktime-git-4d451774b89fbdd2f53204f92b71837af7b06761.zip /libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip +/libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip diff --git a/libquicktime.spec b/libquicktime.spec index 69dd42d..d25cd1c 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,13 +1,13 @@ %define vers_string 1.2.4-98-g859a717 -%define rel_string .20180202.98.g859a717 -%define githash 859a717cef3c624c8e9125b0eaf4d10deb784e98 +%define rel_string .112.20180804gitfff99cd +%define githash fff99cdd4126f379ae538c4d3b09265242512384 %define shorthash %(c=%{githash}; echo ${c:0:10}) Summary: Library for reading and writing Quicktime files Name: libquicktime Version: 1.2.4 -Release: 32%{?rel_string}%{?dist} +Release: 33%{?rel_string}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://libquicktime.sourceforge.net/ @@ -130,6 +130,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \; # -------------------------------------------------------------------- %changelog +* Fri Oct 05 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.4-33.112.20180804gitfff99cd +- Update to 1.2.4.112.20180804gitfff99cd from branch master + * Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 1.2.4-32.20180202.98.g859a717 - Mass rebuild for x264 and/or x265 diff --git a/sources b/sources index e61e18c..ccfd430 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55aa87d3e9fdeb15191c765b317b9a98 libquicktime-git-859a717cef3c624c8e9125b0eaf4d10deb784e98.zip +0edc1b41e7f5143fb0c6bcfb501fc912 libquicktime-git-fff99cdd4126f379ae538c4d3b09265242512384.zip diff --git a/update_libquicktime.sh b/update_libquicktime.sh index f8618fa..90d50b3 100755 --- a/update_libquicktime.sh +++ b/update_libquicktime.sh @@ -1,26 +1,25 @@ -git clone git://github.com/sergiomb2/libquicktime.git +git clone https://sergiomb@git.code.sf.net/p/libquicktime/git libquicktime version=1.2.4 tag=$version branch=master pushd libquicktime git checkout $branch git pull -git log $tag..HEAD > ../ChangeLog +#git log $tag..HEAD > ../ChangeLog newdescrib=$(git describe --tags) date=$(git log -1 --format=%cd --date=short | tr -d \-) -relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/") +relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/\.g/.${date}git/") githash=$(git rev-parse HEAD) shorthash=$(echo $githash | cut -b -10) popd #git checkout libquicktime.spec -sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec +#sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec -rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec +rpmdev-bumpspec -c "Update to $version$relversion from branch $branch" libquicktime.spec spectool -g libquicktime.spec echo Press enter to run: rfpkg new-sources libquicktime-${version}-${githash}.zip; read dummy; rfpkg new-sources libquicktime-git-${githash}.zip -echo Press enter to continue; read dummy; rfpkg ci -c && git show echo Press enter to continue; read dummy; rfpkg push && rfpkg build --nowait