- cleanups

Changed files:
    amavisd.spec -> 1.2

diff --git a/amavisd.spec b/amavisd.spec
index 97386ce7aa3bea993b21d23a67c2e02a498d6470..0a6863193387b37df96fc9df8d9cb5b0e00503ca 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -12,37 +12,34 @@ Group:              Applications/Mail
 Group(de):     Applikationen/Post
 Group(pl):     Aplikacje/Poczta
 Group(pt):     Aplicações/Correio Eletrônico
-Obsoletes:     AMaViS
-Obsoletes:     amavis
-BuildRequires: autoconf >= 2.52
-BuildRequires: perl
-BuildRequires: perl-modules
-BuildRequires: perl-Convert-UUlib
-BuildRequires: perl-Convert-TNEF
-BuildRequires: perl-Unix-Syslog
+BuildRequires: arc
+BuildRequires: autoconf
+BuildRequires: bzip2
+BuildRequires: file
+BuildRequires: lha
+BuildRequires: ncompress
 BuildRequires: perl-Archive-Tar
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-Compress-Zlib
 BuildRequires: perl-MIME-tools
-BuildRequires: file
+BuildRequires: perl-Unix-Syslog
+BuildRequires: perl-devel
 BuildRequires: sh-utils
-BuildRequires: arc
-BuildRequires: bzip2
-BuildRequires: lha
 BuildRequires: unarj
-BuildRequires: ncompress
 BuildRequires: unrar
 BuildRequires: zoo
-Requires:      file
-Requires:      sh-utils
+Obsoletes:     AMaViS
+Obsoletes:     amavis
+Requires:      %{_sbindir}/sendmail
 Requires:      arc
 Requires:      bzip2
+Requires:      file
 Requires:      lha
-Requires:      unarj
 Requires:      ncompress
+Requires:      sh-utils
+Requires:      unarj
 Requires:      unrar
 Requires:      zoo
-Requires:      %{_sbindir}/sendmail
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,37 +56,37 @@ a jednym lub wi
 %build
 autoconf
 %configure \
-       --enable-postfix \
+       --enable-relay \
        --enable-smtp \
-       --with-sendmail-wrapper=%{_sbindir}/sendmail \
-       --with-runtime-dir=/tmp \
-       --with-virusdir=/var/spool/amavis/virusmails \
-       --with-sockname=/var/run/amavisd/amavisd.sock \
-       --with-mailto="postmaster" \
-       --with-amavisuser=amavis
+       --enable-all \
+       --enable-syslog \
+       --with-runtime-dir=%{_var}/spool/amavis/runtime \
+       --with-logdir=%{_var}/log \
+       --with-amavisuser=amavis \
+       --with-sockname=%{_var}/run/amavisd/amavisd.sock
 
 %{__make}
 
-gzip -9nf README* AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html
+gzip -9nf README* NEWS AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/spool/amavis,/var/run/amavisd}
+install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis,%{_var}/run/amavisd}
 
 %{__make} install \
        amavisuser=$(id -u) \
        DESTDIR=$RPM_BUILD_ROOT
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/amavisd
 %attr(755,root,root) %{_sbindir}/amavis
-%attr(754,root,root) /etc/rc.d/init.d/*
-%config %{_sysconfdir}/amavisd.conf 
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/*
+%config(noreplace) %{_sysconfdir}/amavisd.conf 
 %doc *.gz doc/*.gz doc/amavis.png
-%attr(770,amavis,root) /var/spool/amavis
-%attr(755,amavis,root) /var/run/amavisd
+%attr(750,amavis,root) %{_var}/spool/amavis
+%attr(755,amavis,root) %{_var}/run/amavisd
 
 %pre
 if [ -n "`id -u amavis 2>/dev/null`" ]; then
@@ -98,27 +95,27 @@ if [ -n "`id -u amavis 2>/dev/null`" ]; then
                 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
+        %{_sbindir}/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
+        %{_sbindir}/userdel amavis
 fi
 
 %post
 /sbin/chkconfig --add amavisd
 
-if [ -f /var/lock/subsys/amavisd ]; then
-        /etc/rc.d/init.d/amavisd restart >&2
+if [ -f %{_var}/lock/subsys/amavisd ]; then
+        %{_sysconfdir}/rc.d/init.d/amavisd restart >&2
 else
-        echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
+        echo "Run \"%{_sysconfdir}/rc.d/init.d/amavisd start\" to start Amavisd daemon."
 fi
 
 %preun
 if [ "$1" = "0" ];then
-        if [ -f /var/lock/subsys/amavisd ]; then
-                /etc/rc.d/init.d/amavisd stop >&2
+        if [ -f %{_var}/lock/subsys/amavisd ]; then
+                %{_sysconfdir}/rc.d/init.d/amavisd stop >&2
         fi
         /sbin/chkconfig --del amavisd
 fi