From 5a59f06753e555efa6b4c4e3e5ace7511a7c620c Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 21 Nov 2009 20:18:22 +0000 Subject: [PATCH] - adjusted chkconfig positions for clamav-milter (#530101) - use %%apply instead of %%patch --- clamav-milter.sysv | 2 +- clamav.spec | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 693d4ee..170cdc1 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -2,7 +2,7 @@ # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: - 99 1 +# chkconfig: - 79 21 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index f23d693..c8c1c0f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -20,6 +20,8 @@ %{?with_noarch:%global noarch BuildArch: noarch} %{!?release_func:%global release_func() %1%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p%%{-p*}} %%{-b:-b%%{-b*}} \ +%nil} Summary: End-user tools for the Clam Antivirus scanner Name: clamav @@ -312,10 +314,10 @@ The Upstart initscripts for clamav-milter. %prep %setup -q -n %{name}-%{version}%{?snapshot} -%patch24 -p1 -b .private -%patch25 -p1 -b .open -%patch26 -p1 -b .cliopts -%patch27 -p1 -b .umask +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask install -p -m0644 %SOURCE300 clamav-milter/ @@ -696,6 +698,10 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Nov 21 2009 Enrico Scholz +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + * Thu Oct 29 2009 Enrico Scholz - 0.95.3-1300 - updated to 0.95.3