rpm: drop dead conditionals

This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 15fc02d3fa65aff8f333e22260b60f9355c95900..b7dd29e8f13722bb917f2e00e3733b4f012552f2 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -180,12 +180,7 @@ BuildRequires:     expat-devel
 BuildRequires: fcgi-devel
 %endif
 # python-sphinx
-%if 0%{?rhel} > 0 && 0%{?rhel} < 7
-BuildRequires: python-sphinx10
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7
 BuildRequires: python-sphinx
-%endif
 #hardened-cc1
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
@@ -542,13 +537,8 @@ Group:             System Environment/Libraries
 License:       LGPL-2.0
 Requires:      java
 Requires:      libcephfs_jni1 = %{epoch}:%{version}-%{release}
-%if 0%{?el6}
-Requires:      junit4
-BuildRequires: junit4
-%else
 Requires:       junit
 BuildRequires:  junit
-%endif
 %description -n cephfs-java
 This package contains the Java libraries for the Ceph File System.
 
@@ -774,11 +764,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph
-%if 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version}
 %{_sbindir}/mount.ceph
-%else
-/sbin/mount.ceph
-%endif
 %dir %{_libexecdir}/ceph
 %{_libexecdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
@@ -1038,11 +1024,7 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/ceph-fuse
 %{_mandir}/man8/ceph-fuse.8*
-%if 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version}
 %{_sbindir}/mount.fuse.ceph
-%else
-/sbin/mount.fuse.ceph
-%endif
 
 #################################################################################
 %files -n rbd-fuse