- BR: rpm-perlprov

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

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 77dee31304dd493d0db77ccbaa086374cd355967..c5367ed2a84c8be91ff21659fb0d0aa7e37a0386 100644 (file)
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,18 +1,16 @@
 # TODO:
 # - Add polish info mail templates
-# - Some perl master check what Patch1 did 
 %include       /usr/lib/rpm/macros.perl
-%define                _real_ver       2.1.0
-%define                _rc             rc1
 Summary:       A Mail Virus Scanner with SpamAssassin support - daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - demon
 Name:          amavisd-new
-Version:       20040806
-Release:       2
+Version:       2.2.1
+Release:       3
+Epoch:         1
 License:       GPL
 Group:         Applications/Mail
-Source0:       http://www.ijs.si/software/amavisd/%{name}-%{_real_ver}-%{_rc}.tar.gz
-# Source0-md5: b18090497e6537075b732f966a1e5a11
+Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
+# Source0-md5: 567b6df37a2f049fe23c176e6fd1472f
 Source1:       %{name}.init
 Source2:       %{name}-milter.init
 Patch0:                %{name}-config.patch
@@ -21,6 +19,8 @@ Patch2:               %{name}-lib64.patch
 Patch3:                %{name}-tools-dbdir.patch
 URL:           http://www.ijs.si/software/amavisd/
 BuildRequires: autoconf
+BuildRequires: rpm-perlprov
+BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: sendmail-devel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
@@ -29,11 +29,6 @@ Requires(pre):       /usr/sbin/useradd
 Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
 Requires(post,preun):  /sbin/chkconfig
-Requires:      arc
-Requires:      bzip2
-Requires:      file
-Requires:      lha
-Requires:      ncompress
 Requires:      perl-Archive-Tar
 Requires:      perl-Archive-Zip
 Requires:      perl-Compress-Zlib
@@ -45,9 +40,6 @@ Requires:     perl-MIME-tools
 Requires:      perl-Net-Server
 Requires:      perl-Unix-Syslog
 Requires:      sh-utils
-Requires:      unarj
-Requires:      unrar
-Requires:      zoo
 Requires:      /usr/lib/sendmail
 Provides:      group(amavis)
 Provides:      user(amavis)
@@ -78,7 +70,7 @@ zdemonizowana.
 Summary:       A Mail Virus Scanner with SpamAssasin support - sendmail backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      sendmail
 
 %description sendmail
@@ -94,9 +86,9 @@ a jednym lub wi
 Pakiet ten zawiera back-end dla sendmaila.
 
 %prep
-%setup -q -n %{name}-%{_real_ver}
+%setup -q
 %patch0 -p1
-%patch1 -p1
+# %patch1 -p1
 %if "%{_lib}" == "lib64"
 %patch2 -p1
 %endif
@@ -108,19 +100,19 @@ cd helper-progs
 ./configure \
        --with-sendmail=/usr/lib/sendmail \
        --with-runtime-dir=/var/spool/amavis/runtime \
-       --with-sockname=/var/spool/amavis/runtime/amavisd.sock
+       --with-sockname=/var/run/amavisd/amavisd.sock
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,%{_sysconfdir}/rc.d/init.d,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails,db},%{_var}/run/amavisd,/etc/rc.d/init.d,%{_sbindir}}
 
 install amavisd $RPM_BUILD_ROOT%{_sbindir}
 install amavisd-agent $RPM_BUILD_ROOT%{_sbindir}
 install amavisd-nanny $RPM_BUILD_ROOT%{_sbindir}
 install amavisd.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/amavisd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavisd
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/amavis-milter
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavisd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/amavis-milter
 install helper-progs/amavis $RPM_BUILD_ROOT%{_sbindir}
 install helper-progs/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
 
@@ -128,24 +120,8 @@ install helper-progs/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
 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
-else
-       /usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g nobody amavis 1>&2
-fi
+%groupadd -g 116 -r -f amavis
+%useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g amavis amavis
 
 %postun
 if [ "$1" = "0" ]; then
@@ -162,7 +138,7 @@ else
 fi
 
 %preun
-if [ "$1" = "0" ];then
+if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/amavisd ]; then
                /etc/rc.d/init.d/amavisd stop >&2
        fi
@@ -177,7 +153,6 @@ else
        echo "Run \"/etc/rc.d/init.d/amavis-milter start\" to start Amavis-milter daemon."
 fi
 
-
 %preun sendmail
 if [ "$1" = "0" ];then
        if [ -f /var/lock/subsys/amavis-milter ]; then
@@ -186,18 +161,17 @@ if [ "$1" = "0" ];then
        /sbin/chkconfig --del amavis-milter
 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) %{_sysconfdir}/rc.d/init.d/amavisd
-%config(noreplace) %{_sysconfdir}/amavisd.conf
+%attr(754,root,root) /etc/rc.d/init.d/amavisd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavisd.conf
 %attr(750,amavis,amavis) %{_var}/spool/amavis
-%attr(755,amavis,root) %{_var}/run/amavisd
+%attr(750,amavis,amavis) %{_var}/run/amavisd
 
 %files sendmail
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/amavis-milter
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/amavis-milter
 %attr(755,root,root) %{_sbindir}/amavis
 %attr(755,root,root) %{_sbindir}/amavis-milter