- 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 67f6e61b342e98b12e35a7cc81e0593e315c2cd8..4cc98d707b584a58023d4f11bcd88359b00af992 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,14 +1,18 @@
 %include       /usr/lib/rpm/macros.perl
-Summary:       A Mail Virus Scanner with SpamAssasin support - Daemon
+Summary:       A Mail Virus Scanner with SpamAssassin support - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
 Name:          amavisd-new
-Version:       20021227
-Release:       0.1
+Version:       20030616
+Release:       1
 License:       GPL
 Group:         Applications/Mail
-Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}-p1.tar.gz
+Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}-p2.tar.gz
+# Source0-md5: 713a3ffc090481f72e5bb450b4a1f9ab
 Source1:       %{name}.init
-Patch0:                %{name}-paths.patch
+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
@@ -26,16 +30,18 @@ BuildRequires:      perl-Convert-UUlib
 BuildRequires: perl-Convert-TNEF
 BuildRequires: perl-libnet
 BuildRequires: perl-Mail-SpamAssassin
-BuildRequires: perl-Vipuls-Razor-V1
 BuildRequires: perl-Net-Server
 BuildRequires: sh-utils
 BuildRequires: unarj
 BuildRequires: unrar
 BuildRequires: zoo
+Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
+Requires(post,preun):  /sbin/chkconfig
 Requires:      /usr/lib/sendmail
 Requires:      arc
 Requires:      bzip2
@@ -90,34 +96,50 @@ Pakiet ten zawiera back-end dla sendmaila.
 
 %prep
 %setup -q
+%patch100 -p0
 %patch0 -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}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
 
-install amavisd{,conf} $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
 
 %pre
+if [ -n "`getgid amavis`" ]; then
+        if [ "`getgid amavis`" != "116" ]; then
+                echo "Error: group amavis doesn't have gid=116. Correct this before installing amavisd-new." 1>&2
+                exit 1
+        fi
+else
+       echo "adding group amavis GID=116."
+        /usr/sbin/groupadd -g 116 -r -f amavis
+fi
+
 if [ -n "`id -u amavis 2>/dev/null`" ]; then
-       if [ "`id -u amavis`" != "97" ]; then
-               echo "Error: user amavis doesn't have uid=97. Correct this before installing amavis." 1>&2
-               exit 1
-       fi
+       if [ "`id -u amavis`" != "97" ]; then
+               echo "Error: user amavis doesn't have uid=97. Correct this before installing amavis." 1>&2
+               exit 1
+       fi
 else
-       /usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody  amavis 1>&2
+       /usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody  amavis 1>&2
 fi
 
 %postun
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel amavis
+       /usr/sbin/userdel amavis
+       echo "Removing group amavis."
+       /usr/sbin/groupdel amavis
+
 fi
 
 %post
@@ -139,10 +161,10 @@ fi
 %files
 %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(755,root,root) %{_sbindir}/amavisd*
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/*
 %config(noreplace) %{_sysconfdir}/amavisd.conf
-%attr(750,amavis,root) %{_var}/spool/amavis
+%attr(750,amavis,amavis) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd
 
 #%files sendmail