From: Loic Dachary <loic@dachary.org>
Date: Sun, 30 Aug 2015 11:40:09 +0000 (+0200)
Subject: Merge pull request #5207 from SUSE/wip-12267-hammer
X-Git-Tag: v0.94.4~67
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f7e76d2c9e681b3c5775f74c582830f546359703;p=ceph.git

Merge pull request #5207 from SUSE/wip-12267-hammer

ceph.spec.in: 50-rbd.rules conditional is wrong

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

f7e76d2c9e681b3c5775f74c582830f546359703
diff --cc ceph.spec.in
index e80f6d6a90b07,3a0d40e895f4e..4bad23bf0edac
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -485,20 -487,9 +487,15 @@@ install -m 0644 -D src/rgw/logrotate.co
  chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf
  chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config
  
 +# firewall templates
 +%if 0%{?suse_version}
 +install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-mon %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 +install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 +%endif
 +
  # udev rules
- %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
- install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
- install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
- %endif
+ install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules
+ install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules
  
  %if (0%{?rhel} && 0%{?rhel} < 7)
  install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules
@@@ -610,19 -601,10 +607,14 @@@ f
  %{_libdir}/rados-classes/libcls_version.so*
  %dir %{_libdir}/ceph/erasure-code
  %{_libdir}/ceph/erasure-code/libec_*.so*
- %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
- /lib/udev/rules.d/60-ceph-partuuid-workaround.rules
- /lib/udev/rules.d/95-ceph-osd.rules
- %endif
+ %{_udevrulesdir}/60-ceph-partuuid-workaround.rules
+ %{_udevrulesdir}/95-ceph-osd.rules
  %config %{_sysconfdir}/bash_completion.d/ceph
  %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 +%if 0%{?suse_version}
 +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
 +%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
 +%endif
  %{_mandir}/man8/ceph-deploy.8*
  %{_mandir}/man8/ceph-disk.8*
  %{_mandir}/man8/ceph-create-keys.8*