- revert user changes

[packages/amavisd.git] / amavisd.spec

diff --git a/amavisd.spec b/amavisd.spec
index bbfe653100d663890b8fa43e9e7959fdf68488c7..c155b35008a86087796f677e713fbd8c792db1c2 100644 (file)
--- a/amavisd.spec
+++ b/amavisd.spec
@@ -1,5 +1,5 @@
 %include       /usr/lib/rpm/macros.perl
-Summary:       A Mail Virus Scanner - Daemon.
+Summary:       A Mail Virus Scanner - Daemon
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - Demon
 Name:          amavisd
 Version:       20020300
@@ -16,7 +16,7 @@ Patch4:               %{name}-clamav.patch
 URL:           http://www.amavis.org/
 BuildRequires: arc
 BuildRequires: autoconf
-BuildRequires:  automake
+BuildRequires: automake
 BuildRequires: bzip2
 BuildRequires: file
 BuildRequires: lha
@@ -33,10 +33,10 @@ BuildRequires:      sh-utils
 BuildRequires: unarj
 BuildRequires: unrar
 BuildRequires: zoo
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
-Requires(postun):      /usr/sbin/userdel
 Requires:      /usr/lib/sendmail
 Requires:      arc
 Requires:      bzip2
@@ -61,7 +61,7 @@ AMaViS to skrypt po
 a jednym lub wiêcej programów antywirusowych. Wersja zdemonizowana.
 
 %package postfix
-Summary:       A Mail Virus Scanner - postfix back-end.
+Summary:       A Mail Virus Scanner - postfix back-end
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - back-end dla postfiksa
 Group:         Applications/Mail
 Provides:      amavisd-daemon
@@ -69,6 +69,7 @@ Obsoletes:    amavisd-daemon
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
+Requires:      amavisd
 Requires:      postfix
 
 %description postfix
@@ -84,7 +85,7 @@ a jednym lub wi
 Pakiet ten zawiera back-end dla postfiks.
 
 %package exim
-Summary:       A Mail Virus Scanner - exim backend.
+Summary:       A Mail Virus Scanner - exim backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla exima
 Group:         Applications/Mail
 Provides:      amavisd-daemon
@@ -92,6 +93,7 @@ Obsoletes:    amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-qmail
 Obsoletes:     amavisd-sendmail
+Requires:      amavisd
 Requires:      exim
 
 %description exim
@@ -116,6 +118,7 @@ Pakiet ten zawiera back-end dla exima.
 #Obsoletes:    amavisd-postfix
 #Obsoletes:    amavisd-exim
 #Obsoletes:    amavisd-sendmail
+#Requires:     amavisd
 #Requires:     qmailmta
 #
 #%description qmail
@@ -131,7 +134,7 @@ Pakiet ten zawiera back-end dla exima.
 #Pakiet ten zawiera back-end dla qmaila.
 
 %package sendmail
-Summary:       A Mail Virus Scanner - sendmail backend.
+Summary:       A Mail Virus Scanner - sendmail backend
 Summary(pl):   Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:         Applications/Mail
 Provides:      amavisd-daemon
@@ -139,6 +142,7 @@ Obsoletes:  amavisd-daemon
 Obsoletes:     amavisd-postfix
 Obsoletes:     amavisd-exim
 Obsoletes:     amavisd-qmail
+Requires:      amavisd
 Requires:      sendmail
 
 %description sendmail
@@ -153,6 +157,7 @@ a jednym lub wi
 
 Pakiet ten zawiera back-end dla sendmaila.
 
+%define no_install_post_chrpath 1
 %prep
 %setup -q -n %{name}-snapshot-%{version}
 %patch0 -p1
@@ -162,7 +167,8 @@ Pakiet ten zawiera back-end dla sendmaila.
 %patch4 -p1
 
 %build
-aclocal
+rm -f missing
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
@@ -205,7 +211,7 @@ mv amavis/amavisd amavis/amavisd.exim
 #      --with-amavisuser=amavis \
 #      --with-sockname=%{_var}/run/amavisd/amavisd.sock
 #
-#%{__make}
+#%%{__make}
 #mv amavis/amavisd amavis/amavisd.qmail
 
 %configure \
@@ -229,7 +235,7 @@ install -d $RPM_BUILD_ROOT{%{_var}/spool/amavis/{runtime,virusmails},%{_var}/run
 %{__make} install \
        amavisuser=$(id -u) \
        DESTDIR=$RPM_BUILD_ROOT
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
+install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 install amavis/amavisd.{exim,postfix,sendmail} $RPM_BUILD_ROOT%{_sbindir}
 
@@ -238,17 +244,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 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
 fi
 
 %post
@@ -283,7 +289,7 @@ ln -sf amavisd.sendmail %{_sbindir}/amavisd
 %defattr(644,root,root,755)
 %doc README* NEWS AUTHORS BUGS ChangeLog FAQ HINTS TODO doc/amavis.html doc/amavis.png
 %attr(755,root,root) %{_sbindir}/amavis
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/*
+%attr(754,root,root) /etc/rc.d/init.d/*
 %config(noreplace) %{_sysconfdir}/amavisd.conf
 %attr(750,amavis,root) %{_var}/spool/amavis
 %attr(755,amavis,root) %{_var}/run/amavisd