From 9b966f274c6e8640d344baf702a5116a271ba1e2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 15 Jun 2021 09:23:51 +0200 Subject: [PATCH 1/3] Revert "Update to 1.19.1" This reverts commit a8470a35dd0ead179c0a4db0c3db4db7b2778574. --- .gitignore | 1 - gstreamer1.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 90eed64..c4ce133 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,3 @@ /gstreamer-1.18.1.tar.xz /gstreamer-1.18.2.tar.xz /gstreamer-1.18.4.tar.xz -/gstreamer-1.19.1.tar.xz diff --git a/gstreamer1.spec b/gstreamer1.spec index 225c899..76b68b9 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -15,9 +15,14 @@ %bcond_with unwind %endif +# The 1.19.1 development release was wrongly pushed into stable f34. +# Instead of updating the epoch, 1.19.1-1.18.4.x is used because this +# is a temporary version problem that will resolve itself in f35. +%global realversion 1.18.4 + Name: gstreamer1 Version: 1.19.1 -Release: 1%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: %{realversion}.1%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework runtime License: LGPLv2+ @@ -25,9 +30,9 @@ URL: http://gstreamer.freedesktop.org/ %if 0%{?gitrel} # git clone git://anongit.freedesktop.org/gstreamer/gstreamer # cd gstreamer; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck -Source0: gstreamer-%{version}.tar.xz +Source0: gstreamer-%{realversion}.tar.xz %else -Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz +Source0: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{realversion}.tar.xz %endif ## For GStreamer RPM provides Patch0: gstreamer-inspect-rpm-format.patch @@ -86,7 +91,7 @@ GStreamer streaming media framework. %prep -%setup -q -n gstreamer-%{version} +%setup -q -n gstreamer-%{realversion} %patch0 -p1 -b .rpm-provides %build @@ -196,8 +201,9 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog -* Thu Jun 03 2021 Wim Taymans - 1.19.1-1 -- Update to 1.19.1 +* Tue Jun 15 2021 Wim Taymans - 1.19.1-1.18.4.1 +- Reverted from wrong unstable 1.19.1 update. F34 should keep the + stable 1.18.4 version. * Tue Apr 6 2021 Wim Taymans - 1.18.4-2 - Fix build options to disable libunwind and libdw diff --git a/sources b/sources index f915213..6df7e1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gstreamer-1.19.1.tar.xz) = 989b3f4fd6d2e96d6e1949a89e75acc090d08868873faab2dd933c9d2494f05cec18001100e7acb7560fc5c59b22f7ce35bb0590bfa392d276d43f61bcb810fd +SHA512 (gstreamer-1.18.4.tar.xz) = 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a From 9917291c16868084bbe9c1678f0d30897ce835fc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 17 Jun 2021 11:45:01 +0200 Subject: [PATCH 2/3] Move baserelease before real version --- gstreamer1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1.spec b/gstreamer1.spec index 76b68b9..74279d3 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -22,7 +22,7 @@ Name: gstreamer1 Version: 1.19.1 -Release: %{realversion}.1%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: 1.%{realversion}%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework runtime License: LGPLv2+ @@ -201,6 +201,9 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog +* Thu Jun 17 2021 Wim Taymans - 1.19.1-1.1.18.4 +- Move baserelease before real version + * Tue Jun 15 2021 Wim Taymans - 1.19.1-1.18.4.1 - Reverted from wrong unstable 1.19.1 update. F34 should keep the stable 1.18.4 version. From 2f126403c1c002a608289ae0ab2853d06324365b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 17 Jun 2021 12:08:51 +0200 Subject: [PATCH 3/3] Bump for rebuild --- gstreamer1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1.spec b/gstreamer1.spec index 74279d3..dfb620d 100644 --- a/gstreamer1.spec +++ b/gstreamer1.spec @@ -22,7 +22,7 @@ Name: gstreamer1 Version: 1.19.1 -Release: 1.%{realversion}%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: 2.%{realversion}%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer streaming media framework runtime License: LGPLv2+ @@ -201,6 +201,9 @@ install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer %changelog +* Thu Jun 17 2021 Wim Taymans - 1.19.1-2.1.18.4 +- Bump for rebuild + * Thu Jun 17 2021 Wim Taymans - 1.19.1-1.1.18.4 - Move baserelease before real version