996f18d0e8
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I5a0d830d8bc8ec5c85959bb1b4c243e8c56764c1 Signed-off-by: slin14 <shuicheng.lin@intel.com>
51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
From 29fcff1071739e05f6623ffb7f5af828e2261e87 Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 16:22:44 -0400
|
|
Subject: WRS: crond-adjustment.patch
|
|
|
|
---
|
|
SPECS/logrotate.spec | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/logrotate.spec b/SPECS/logrotate.spec
|
|
index 0dbde7d..0eac8bf 100644
|
|
--- a/SPECS/logrotate.spec
|
|
+++ b/SPECS/logrotate.spec
|
|
@@ -7,6 +7,7 @@ Group: System Environment/Base
|
|
URL: https://github.com/logrotate/logrotate
|
|
Source: https://fedorahosted.org/releases/l/o/logrotate/logrotate-%{version}.tar.gz
|
|
Source1: rwtab
|
|
+Source2: logrotate-cron.d
|
|
Patch0: logrotate-3.8.6-force.patch
|
|
Patch1: logrotate-3.8.6-r465.patch
|
|
Patch2: logrotate-3.8.6-sortglob.patch
|
|
@@ -105,6 +106,10 @@ install -p -m 755 examples/logrotate.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.da
|
|
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d
|
|
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/logrotate
|
|
|
|
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
|
|
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/logrotate
|
|
+mv $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.cron
|
|
+
|
|
%pre
|
|
# If /var/lib/logrotate/logrotate.status does not exist, create it and copy
|
|
# the /var/lib/logrotate.status in it (if it exists). We have to do that in pre
|
|
@@ -124,12 +129,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
%attr(0755, root, root) %{_sbindir}/logrotate
|
|
%attr(0644, root, root) %{_mandir}/man8/logrotate.8*
|
|
%attr(0644, root, root) %{_mandir}/man5/logrotate.conf.5*
|
|
-%attr(0700, root, root) %config(noreplace) %{_sysconfdir}/cron.daily/logrotate
|
|
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/logrotate.conf
|
|
%attr(0755, root, root) %dir %{_sysconfdir}/logrotate.d
|
|
%attr(0755, root, root) %dir %{_localstatedir}/lib/logrotate
|
|
%attr(0644, root, root) %ghost %verify(not size md5 mtime) %{_localstatedir}/lib/logrotate/logrotate.status
|
|
%config(noreplace) %{_sysconfdir}/rwtab.d/logrotate
|
|
+%{_sysconfdir}/cron.d/logrotate
|
|
+%attr(0700, root, root) %{_sysconfdir}/logrotate.cron
|
|
|
|
%changelog
|
|
* Mon Sep 25 2017 Kamil Dudka <kdudka@redhat.com> - 3.8.6-15
|
|
--
|
|
2.7.4
|
|
|