]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: fix _with_systemd conditional 4181/head
authorKen Dreyer <kdreyer@redhat.com>
Wed, 25 Mar 2015 18:16:03 +0000 (12:16 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Wed, 25 Mar 2015 18:16:03 +0000 (12:16 -0600)
The RPM conditional needs a "?" in the event that it is not defined.

ceph.spec.in

index 0af78f2d8527e328f564e9e7556e0d7ef169748a..1d9b8ba350fdc5f971ccd8335146e9e67095d375 100644 (file)
@@ -47,7 +47,7 @@ Requires:     hdparm
 Requires:      cryptsetup
 Requires(post):        binutils
 # We require this to be present for %%{_tmpfilesdir}
-%if 0%{_with_systemd}
+%if 0%{?_with_systemd}
 Requires: systemd
 %endif
 BuildRequires: gcc-c++
@@ -485,7 +485,7 @@ install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
 install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
 install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
 install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
-%if 0%{_with_systemd}
+%if 0%{?_with_systemd}
   install -m 0644 -D systemd/ceph.tmpfiles.d $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
 %endif
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -585,7 +585,7 @@ fi
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-coverage
 %{_initrddir}/ceph
-%if 0%{_with_systemd}
+%if 0%{?_with_systemd}
 %{_tmpfilesdir}/%{name}.conf
 %endif
 %{_sbindir}/ceph-disk