From 107bfd9ee7dbf360561187b9e0946964d40b9b1c Mon Sep 17 00:00:00 2001 From: Erik Logtenberg Date: Fri, 1 Aug 2014 14:20:18 +0200 Subject: [PATCH] ceph.spec.in: We need those nice recent changes for rhel7 in Fedora too. Signed-off-by: Erik Logtenberg (cherry picked from commit 00877ae502ac52613bcd5c5c834d72787d668dca) --- ceph.spec.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 66a3d10c5c2df..65db37e7b362b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -61,7 +61,7 @@ BuildRequires: snappy-devel ################################################################################# # specific ################################################################################# -%if ! 0%{?rhel} +%if ! 0%{?rhel} || 0%{?fedora} BuildRequires: sharutils %endif @@ -353,7 +353,7 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/50-rbd.rules install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %else @@ -367,7 +367,7 @@ install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/9 install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules mv $RPM_BUILD_ROOT/sbin/mkcephfs $RPM_BUILD_ROOT/usr/sbin/mkcephfs mv $RPM_BUILD_ROOT/sbin/mount.ceph $RPM_BUILD_ROOT/usr/sbin/mount.ceph @@ -449,7 +449,7 @@ fi %{_sbindir}/ceph-disk-udev %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.ceph %else /sbin/mount.ceph @@ -476,7 +476,7 @@ fi %{_libdir}/ceph/erasure-code/libec_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_test_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules /usr/lib/udev/rules.d/95-ceph-osd.rules %else @@ -554,7 +554,7 @@ fi %defattr(-,root,root,-) %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.fuse.ceph %else /sbin/mount.fuse.ceph @@ -649,7 +649,7 @@ fi %files -n librbd1 %defattr(-,root,root,-) %{_libdir}/librbd.so.* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/50-rbd.rules %else /lib/udev/rules.d/50-rbd.rules -- 2.39.5