- Last minute trivial patch for amavisd-new-20030616

[packages/amavisd-new.git] / amavisd-new.spec

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 8aa8c99d23233f3cd8748fb73ae772f1b4f61802..4cc98d707b584a58023d4f11bcd88359b00af992 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -2,16 +2,17 @@
 Summary:       A Mail Virus Scanner with SpamAssassin support - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
 Name:          amavisd-new
-Version:       20030314
-Release:       3
+Version:       20030616
+Release:       1
 License:       GPL
 Group:         Applications/Mail
-Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}-p1.tar.gz
-# Source0-md5: 3dcee8ad46afbf23d09bdea64621e5a3
+Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}-p2.tar.gz
+# Source0-md5: 713a3ffc090481f72e5bb450b4a1f9ab
 Source1:       %{name}.init
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-bin.patch
 Patch2:                %{name}-config-mks.patch
+Patch100:      http://www.ijs.si/software/amavisd/amavisd-new-20030616-p3.patch
 URL:           http://www.amavis.org/
 BuildRequires: arc
 BuildRequires: autoconf
@@ -34,9 +35,12 @@ BuildRequires:       sh-utils
 BuildRequires: unarj
 BuildRequires: unrar
 BuildRequires: zoo
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/lib/sendmail
 Requires:      arc
@@ -92,19 +96,20 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %prep
 %setup -q
+%patch100 -p0
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
 
-install amavisd $RPM_BUILD_ROOT%{_sbindir}/
-install amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
+install amavisd $RPM_BUILD_ROOT%{_sbindir}
+install amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavisd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -157,7 +162,7 @@ fi
 %defattr(644,root,root,755)
 %doc AAAREADME.first INSTALL RELEASE_NOTES README_FILES/* test-messages
 %attr(755,root,root) %{_sbindir}/amavisd*
-%attr(754,root,root) /etc/rc.d/init.d/*
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/*
 %config(noreplace) %{_sysconfdir}/amavisd.conf
 %attr(750,amavis,amavis) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd