diff --git a/gstreamer1-plugins-good.spec b/gstreamer1-plugins-good.spec
index 77b06b9..541b1f0 100644
--- a/gstreamer1-plugins-good.spec
+++ b/gstreamer1-plugins-good.spec
@@ -1,7 +1,7 @@
 %global         majorminor      1.0
 
 # Turn off extras package on RHEL.
-%if ! 0%{?rhel}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %bcond_without extras
 %else
 %bcond_with extras
@@ -13,7 +13,7 @@
 
 Name:           gstreamer1-plugins-good
 Version:        1.12.3
-Release:        1%{?gitcommit:.git%{shortcommit}}%{?dist}
+Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer plugins with good code and licensing
 
 License:        LGPLv2+
@@ -269,6 +269,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Oct 13 2017 Troy Dawson <tdawson@redhat.com> - 1.12.3-2
+- Cleanup spec file conditionals
+
 * Tue Sep 19 2017 Wim Taymans <wtaymans@redhat.com> - 1.12.3-1
 - Update to 1.12.3