From 75c18462ef81e493059822b54296312ecf63ac3e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 21 Mar 2016 20:45:26 -0500 Subject: [PATCH] move the mozila-openh264 definition before gstreamer1-plugin-openh264 - gstreamer1-plugin-openh264 redefines version and release messing up requires Signed-off-by: Dennis Gilmore --- openh264.spec | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/openh264.spec b/openh264.spec index 8c17e94..5b818eb 100644 --- a/openh264.spec +++ b/openh264.spec @@ -8,10 +8,12 @@ %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global gst_version 1.6.1 +#needs to be bumped for every build +%global gst_release 2 Name: openh264 Version: 1.5.2 -Release: 0.3.git%{shortcommit0}%{?dist} +Release: 0.4.git%{shortcommit0}%{?dist} Summary: H.264 codec library License: BSD @@ -44,9 +46,19 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n mozilla-openh264 +Summary: H.264 codec support for Mozilla browsers +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mozilla-filesystem%{?_isa} + +%description -n mozilla-openh264 +The mozilla-openh264 package contains a H.264 codec plugin for Mozilla +browsers. + + %package -n gstreamer1-plugin-openh264 Version: %{gst_version} -Release: 1%{?dist} +Release: %{gst_release}%{?dist} Summary: GStreamer H.264 plugin %description -n gstreamer1-plugin-openh264 @@ -56,16 +68,6 @@ operate on media data. This package contains the H.264 plugin. -%package -n mozilla-openh264 -Summary: H.264 codec support for Mozilla browsers -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: mozilla-filesystem%{?_isa} - -%description -n mozilla-openh264 -The mozilla-openh264 package contains a H.264 codec plugin for Mozilla -browsers. - - %prep %setup -qn openh264-%{commit0} @@ -221,6 +223,10 @@ popd %changelog +* Mon May 21 2016 Dennis Gilmore - 1.5.2-0.4.git21e44bd +- move the mozila-openh264 definition before gstreamer1-plugin-openh264 +- gstreamer1-plugin-openh264 redefines version and release messing up requires + * Mon Nov 30 2015 Kalev Lember - 1.5.2-0.3.git21e44bd - Include the gstreamer plugin in gstreamer1-plugin-openh264 subpackage