RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax

Browse Source 
ceph.spec.in: fix _with_systemd conditional

Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2015-03-25 21:40:22 +01:00
commit 896310c0b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceph.spec.in
View File

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