Code Review
/
packages
/
centos7
/
cobbler.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix logrotate postrotate command
[packages/centos7/cobbler.git]
/
cobbler.spec
diff --git
a/cobbler.spec
b/cobbler.spec
index 93f731a45d4b1ee82817100cd6db4e913bdf7519..e616292e1f2f0b556903651e9fa6e81002ad80ad 100644
(file)
--- a/
cobbler.spec
+++ b/
cobbler.spec
@@
-16,8
+16,9
@@
Name: cobbler
License: GPLv2+
AutoReq: no
Version: 2.6.9
License: GPLv2+
AutoReq: no
Version: 2.6.9
-Release: 1%{?dist}~mos1
2
+Release: 1%{?dist}~mos1
3
Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1: cobblerd.logrotate
# Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
Patch0: cobbler-virtinstall.patch
# Support centos release numbering
# Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
Patch0: cobbler-virtinstall.patch
# Support centos release numbering
@@
-112,7
+113,11
@@
test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobbler.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
rm $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobbler.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+%if 0%{?rhel} < 7
mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd_rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd_rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
+%else
+mv %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cobblerd
+%endif
# Create data directories in tftp_dir
mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}
# Create data directories in tftp_dir
mkdir -p $RPM_BUILD_ROOT%{tftp_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}