- release 7

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

diff --git a/amavisd-new.spec b/amavisd-new.spec
index b1254e15e2f263e4c1847d4d54852237f06124bb..e94b44cc764df2a560b49e47649233da89acb4b3 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,18 +1,22 @@
+# TODO:
+# - Add polish info mail templates
+# - Some perl master check what Patch1 did 
+
 %include       /usr/lib/rpm/macros.perl
-Summary:       A Mail Virus Scanner with SpamAssassin support - Daemon
-Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - Demon
+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:       2
+Version:       20030616
+Release:       7
 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}-p7.tar.gz
+# Source0-md5: e6f35be1e14861e3869debdd9bdfbfba
 Source1:       %{name}.init
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-bin.patch
-Patch2:                %{name}-config-mks.patch
-URL:           http://www.amavis.org/
+# Patch1:      %{name}-bin.patch # I don't get perl and it has rejects
+Patch3:                %{name}-cpio-reads-tar.patch
+URL:           http://www.ijs.si/software/amavisd/
 BuildRequires: arc
 BuildRequires: autoconf
 BuildRequires: automake
@@ -34,9 +38,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
@@ -53,6 +60,7 @@ Requires:     perl-Mail-SpamAssassin
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     AMaViS
 Obsoletes:     amavis
+Obsoletes:     amavisd
 Obsoletes:     amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
@@ -93,35 +101,47 @@ Pakiet ten zawiera back-end dla sendmaila.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%%patch1 -p1
+%patch3 -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
 
 %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
@@ -144,9 +164,9 @@ 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,root) %{_var}/spool/amavis
+%attr(750,amavis,amavis) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd
 
 #%files sendmail