Cleanup spec file conditionals

libburn.spec

@@ -1,6 +1,6 @@
 %global pkgname libburn
 
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
 %global cdrskin cdrskin1
 %else
 %global cdrskin cdrskin
@@ -9,7 +9,7 @@
 Summary:         Library for reading, mastering and writing optical discs
 Name:            libburn
 Version:         1.4.8
-Release:         1%{?dist}
+Release:         2%{?dist}
 License:         GPLv2+
 Group:           System Environment/Libraries
 URL:             http://libburnia-project.org/
@@ -17,7 +17,7 @@ Source0:         http://files.libburnia-project.org/releases/%{pkgname}-%{versio
 Source1:         http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig
 Patch0:          libburn-0.6.16-multilib.patch
 BuildRequires:   intltool, gettext
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
 BuildRequires:   autoconf, automake, libtool, pkgconfig
 %endif
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,7 +72,7 @@ features from the command line.
 %patch0 -p1 -b .multilib
 
 # Rename from libburn to libburn1 for RHEL >= 6
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
 sed -e 's@libburn_libburn@libburn_libburn1@g' \
     -e 's@libburn/libburn.la@libburn/libburn1.la@g' \
     -e 's@(includedir)/libburn@(includedir)/libburn1@g' \
@@ -100,7 +100,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}
 
 # RHEL >= 6 ships a cdrskin package already
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
 mv -f $RPM_BUILD_ROOT%{_bindir}/{cdrskin,%{cdrskin}}
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/{cdrskin,%{cdrskin}}.1
 %endif
@@ -155,6 +155,9 @@ fi
 %{_mandir}/man1/%{cdrskin}.1*
 
 %changelog
+* Fri Dec 01 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.4.8-2
+- Cleanup spec file conditionals
+
 * Fri Sep 15 2017 Robert Scheck <robert@fedoraproject.org> 1.4.8-1
 - Upgrade to 1.4.8 (#1491478)