[gstreamer-plugins-bad/f33: 2/2] Merge branch 'f32' into f33
commit 5bbb5c0db3e000df0eaea7d998fa92f729e93d5e
Merge: 83807fa 085313b
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Sep 6 15:56:46 2020 +0200
Merge branch 'f32' into f33
gstreamer-plugins-bad.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --cc gstreamer-plugins-bad.spec
index b4a6081,fd2367c..79c5a0c
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@@ -30,9 -30,9 +30,11 @@@ Patch11: gst-plugins-bad-0.10.23-timidi
Patch12: 0001-vmncdec-Sanity-check-width-height-before-using-it.patch
Patch13: 0002-h264parse-Ensure-codec_data-has-the-required-size-wh.patch
Patch14: 0001-fix-faad2-version-check.patch
+# Fix build with make-4.3
+Patch15: %{name}-make43.patch
+ Provides: %{name}-free = %{version}-%{release}
+ Obsoletes: %{name}-free < 0.10.36-15
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
@@@ -300,9 -302,11 +304,12 @@@ rm -r %{buildroot}%{_datadir}/gtk-do
%changelog
+ * Sun Sep 06 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-15
+ - add missing Provides/Obsoletes for gstreamer-plugins-bad-free{,-devel}
+
* Fri Sep 04 2020 Dominik Mierzejewski <rpm(a)greysector.net> - 0.10.23-14
- merge with -free from Fedora
+- fix build with make 4.3
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.10.23-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild