[gstreamer1-plugins-ugly/f25] A better fix, add requires gstreamer1-plugins-ugly-free-devel (rfbz #4589)

commit e7f86acad266870b7d1d1d6c7e124244289fa5fc Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sun Jul 9 22:26:56 2017 +0100 A better fix, add requires gstreamer1-plugins-ugly-free-devel (rfbz #4589) gstreamer1-plugins-ugly.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) --- diff --git a/gstreamer1-plugins-ugly.spec b/gstreamer1-plugins-ugly.spec index e9abc54..dc2230a 100644 --- a/gstreamer1-plugins-ugly.spec +++ b/gstreamer1-plugins-ugly.spec @@ -1,11 +1,13 @@ +%global src_name gst-plugins-ugly + Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins Name: gstreamer1-plugins-ugly Version: 1.10.5 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Applications/Multimedia -URL: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{... +URL: https://gstreamer.freedesktop.org/ +Source0: %{url}/src/gst-plugins-ugly/%{src_name}-%{version}.tar.x BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: gettext-devel gtk-doc @@ -18,7 +20,7 @@ BuildRequires: x264-devel >= 0.0.0-0.28 BuildRequires: opencore-amr-devel # Provides locale files -Requires: gstreamer1-plugins-ugly-free%{?_isa} = %{version} +Requires: %{name}-free%{?_isa} = %{version} %description GStreamer is a streaming media framework, based on graphs of elements which @@ -35,6 +37,7 @@ gstreamer-plugins-good because: Summary: Development documentation for the GStreamer "ugly" plug-ins Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-free-devel = %{version} BuildArch: noarch %description devel-docs @@ -49,7 +52,7 @@ be shipped in gstreamer-plugins-good because: %prep -%autosetup -p1 -n gst-plugins-ugly-%{version} +%autosetup -p1 -n %{src_name}-%{version} %build @@ -71,7 +74,7 @@ be shipped in gstreamer-plugins-good because: %make_install V=1 rm %{buildroot}%{_libdir}/gstreamer-1.0/*.la rm -rf %{buildroot}%{_datadir}/locale/ -rm %{buildroot}%{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-1.0/gst-plugins-ugly-plugins-1.0.devhelp2 +rm %{buildroot}%{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/* %files @@ -93,10 +96,13 @@ rm %{buildroot}%{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-1.0/gst-plugins %files devel-docs # Take the dir and everything below it for proper dir ownership -%doc %{_datadir}/gtk-doc +%doc %{_datadir}/gtk-doc/html/%{src_name}-plugins-1.0/ %changelog +* Sun Jul 09 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.10.5-3 +- A better fix, add requires gstreamer1-plugins-ugly-free-devel (rfbz #4589) + * Sun Jul 09 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.10.5-2 - Remove conflicting file in devel-docs (rfbz #4589)