From 6145575b15fc89959a86c8af05816dab7ac77ac3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 May 2018 08:29:41 -0500 Subject: [PATCH] Backport changes from master --- gstreamer1-plugins-ugly.spec | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec index 6ea4928..e6d6115 100644 --- a/gstreamer1-plugins-ugly.spec +++ b/gstreamer1-plugins-ugly.spec @@ -3,23 +3,24 @@ Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins Name: gstreamer1-plugins-ugly Version: 1.14.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ -Group: Applications/Multimedia URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/%{src_name}/%{src_name}-%{version}.tar.xz +BuildRequires: gcc BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: gettext-devel BuildRequires: libid3tag-devel >= 0.15.0 -BuildRequires: mpeg2dec-devel >= 0.4.0 +BuildRequires: libmpeg2-devel >= 0.4.0 BuildRequires: orc-devel >= 0.4.5 BuildRequires: x264-devel >= 0.0.0-0.28 BuildRequires: opencore-amr-devel # Provides locale files -Requires: %{name}-free%{?_isa} = %{version} +# relax dep to >= to make fedora/rpmfusion upgrades easier +Requires: %{name}-free%{?_isa} >= %{version} # Subpkg is empty, so no point -- rex Obsoletes: %{name}-devel-docs < 1.13 @@ -35,23 +36,6 @@ gstreamer-plugins-good because: - there are possible licensing issues with the code. -%package devel-docs -Summary: Development documentation for the GStreamer "ugly" plug-ins -Requires: %{name} = %{version}-%{release} -Requires: %{name}-free-devel = %{version} -BuildArch: noarch - -%description devel-docs -GStreamer is a streaming media framework, based on graphs of elements which -operate on media data. - -This package contains the development documentation for the plug-ins that can't -be shipped in gstreamer-plugins-good because: -- the license is not LGPL -- the license of the library is not LGPL -- there are possible licensing issues with the code. - - %prep %autosetup -p1 -n %{src_name}-%{version} @@ -98,12 +82,11 @@ rm -fv %{buildroot}%{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/* %{_libdir}/gstreamer-1.0/libgstmpeg2dec.so %{_libdir}/gstreamer-1.0/libgstx264.so -#files devel-docs -# Take the dir and everything below it for proper dir ownership -#doc %{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/ - %changelog +* Fri Sep 06 2019 Xavier Bachelot - 1.14.0-1.1 +- Backport changes from master. + * Fri Mar 23 2018 Rex Dieter - 1.14.0-1 - 1.14.0