Cleanup spec file conditionals

gstreamer1-plugins-bad-free.spec

@@ -1,8 +1,8 @@
 %global         majorminor 1.0
 %global         _gobject_introspection  1.31.1
 
-# Turn of extras package on RHEL.
+# Turn of extras package on older RHEL.
-%if ! 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_without extras
 %else
 %bcond_with extras
@@ -14,7 +14,7 @@
 
 Name:           gstreamer1-plugins-bad-free
 Version:        1.12.3
-Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        3%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -62,7 +62,7 @@ BuildRequires:  wavpack-devel
 BuildRequires:  opus-devel
 BuildRequires:  nettle-devel
 BuildRequires:  libgcrypt-devel
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires:  libwayland-client-devel
 %endif
 BuildRequires:  gnutls-devel
@@ -323,7 +323,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbadvideo-%{majorminor}.so
 %{_libdir}/libgstplayer-%{majorminor}.so.*
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgsturidownloader-%{majorminor}.so.*
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so.*
 %endif
 
@@ -422,7 +422,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbadvideo-%{majorminor}.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstttmlsubs.so
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so
 %endif
 %{_libdir}/gstreamer-%{majorminor}/libgstwebp.so
@@ -490,7 +490,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbadvideo-%{majorminor}.so
 %{_libdir}/libgstplayer-%{majorminor}.so
 %{_libdir}/libgstphotography-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so
 %endif
 
@@ -522,6 +522,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstbadvideo-%{majorminor}.so
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
 
 %changelog
+* Fri Oct 13 2017 Troy Dawson <tdawson@redhat.com> - 1.12.3-3
+- Cleanup spec file conditionals
+
 * Sat Sep 30 2017 Jerry James <loganjerry@gmail.com> - 1.12.3-2
 - Rebuild for soundtouch 2.0.0