mirror of
https://github.com/ceph/ceph
synced 2025-02-20 17:37:29 +00:00
Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax
ceph.spec.in: fix _with_systemd conditional Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
commit
896310c0b8
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user