ad4ba94235
Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: Ia0510ab3c8879bc0ebd15261db2edaa84b346f20 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
From 3eac39ba534b92dbcb3a898442b09be7acc389bb Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 16:12:36 -0400
|
|
Subject: [PATCH 4/7] WRS: meta_remove_bad_logrotate.patch
|
|
|
|
---
|
|
SPECS/haproxy.spec | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec
|
|
index af94d46..3d112e0 100644
|
|
--- a/SPECS/haproxy.spec
|
|
+++ b/SPECS/haproxy.spec
|
|
@@ -18,7 +18,6 @@ URL: http://www.haproxy.org/
|
|
Source0: http://www.haproxy.org/download/1.5/src/haproxy-%{version}.tar.gz
|
|
Source1: %{name}.service
|
|
Source2: %{name}.cfg
|
|
-Source3: %{name}.logrotate
|
|
Source4: %{name}.sysconfig
|
|
Source5: halog.1
|
|
Source10: %{name}.sh
|
|
@@ -88,7 +87,6 @@ mkdir -p /etc/init.d
|
|
|
|
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
|
|
%{__install} -p -D -m 0640 %{SOURCE2} %{buildroot}%{haproxy_confdir}/%{name}.cfg
|
|
-%{__install} -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
|
|
%{__install} -p -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
|
|
%{__install} -p -D -m 0644 %{SOURCE5} %{buildroot}%{_mandir}/man1/halog.1
|
|
%{__install} -p -D -m 0755 %{SOURCE10} %{buildroot}/etc/init.d/%{name}
|
|
@@ -147,7 +145,6 @@ fi
|
|
%dir %{haproxy_datadir}
|
|
%{haproxy_datadir}/*
|
|
%config(noreplace) %{haproxy_confdir}/%{name}.cfg
|
|
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
|
%{_unitdir}/%{name}.service
|
|
%{_sbindir}/%{name}
|
|
--
|
|
1.9.1
|
|
|