X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavisd-new.spec;h=729d8b1be9802fbb70d37119068fd8f31fa29af4;hb=709e954118708b640c0e4c98ca5420b4b01aab1c;hp=1f4c403bf87f416275d7bcc977c251b5cee0a613;hpb=398599b835c9eddb021bd09aa16c391f2af1a62f;p=packages%2Famavisd-new.git

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 1f4c403..729d8b1 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,84 +1,81 @@
 # TODO:
 # - Add polish info mail templates
-# - Some perl master check what Patch1 did 
+# - move amavis part of tmpwatch configuration from tmpwatch.spec
+#
 %include	/usr/lib/rpm/macros.perl
-%define		_real_ver	2.1.2
 Summary:	A Mail Virus Scanner with SpamAssassin support - daemon
-Summary(pl):	Antywirusowy skaner poczty elektronicznej z obs³ug± SpamAssasina - demon
+Summary(pl.UTF-8):	Antywirusowy skaner poczty elektronicznej z obsługą SpamAssasina - demon
 Name:		amavisd-new
-Version:	20040906
+Version:	2.6.1
 Release:	2
+Epoch:		1
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://www.ijs.si/software/amavisd/%{name}-%{_real_ver}.tar.gz
-# Source0-md5:	d24bafbe84668dec71a38a074b6bb920
+Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
+# Source0-md5:	2474d4c034f96a58e5b8af91af514689
 Source1:	%{name}.init
 Source2:	%{name}-milter.init
+Source3:	%{name}.tmpwatch
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-dirperms.patch
-Patch2:		%{name}-lib64.patch
-Patch3:		%{name}-tools-dbdir.patch
+Patch1:		%{name}-tools-dbdir.patch
 URL:		http://www.ijs.si/software/amavisd/
-BuildRequires:	autoconf
-BuildRequires:	rpmbuild(macros) >= 1.159
-BuildRequires:	sendmail-devel
-Requires(pre):	/usr/bin/getgid
+BuildRequires:	libmilter-devel
+BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.304
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
 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:	arc
-Requires:	bzip2
-Requires:	file
-Requires:	lha
-Requires:	ncompress
+Requires:	/usr/lib/sendmail
 Requires:	perl-Archive-Tar
-Requires:	perl-Archive-Zip
-Requires:	perl-Compress-Zlib
+Requires:	perl-Archive-Zip >= 1.14
+Requires:	perl-Compress-Zlib >= 1.35
 Requires:	perl-Convert-TNEF
-Requires:	perl-Convert-UUlib
-Requires:	perl-libnet
-Requires:	perl-Mail-SpamAssassin
+Requires:	perl-Convert-UUlib >= 1.05
 Requires:	perl-MIME-tools
-Requires:	perl-Net-Server
+Requires:	perl-Mail-SpamAssassin
+Requires:	perl-Net-Server >= 0.93
+Requires:	perl-Time-HiRes >= 1.49
 Requires:	perl-Unix-Syslog
+Requires:	perl-libnet
+Requires:	perl-Mail-DKIM >= 0.31
 Requires:	sh-utils
-Requires:	unarj
-Requires:	unrar
-Requires:	zoo
-Requires:	/usr/lib/sendmail
 Provides:	group(amavis)
 Provides:	user(amavis)
 Obsoletes:	AMaViS
 Obsoletes:	amavis
 Obsoletes:	amavisd
 Obsoletes:	amavisd-daemon
-Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
-Obsoletes:	amavisd-qmail
-Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-exim
+Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-qmail
+Obsoletes:	amavisd-postfix
+Obsoletes:	amavisd-qmail
 Conflicts:	amavis-stats <= 0.1.12
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_tmpwatchdir	/etc/tmpwatch
+%define		schemadir	/usr/share/openldap/schema
+
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
 one or more virus scanners and SpamAssasin. This is daemonized version
 of amavis.
 
-%description -l pl
-AMaViS to skrypt po¶rednicz±cy pomiêdzy agentem transferu poczty (MTA)
-a jednym lub wiêcej programów antywirusowych i SpamAssasinem. Wersja
+%description -l pl.UTF-8
+AMaViS to skrypt pośredniczący pomiędzy agentem transferu poczty (MTA)
+a jednym lub więcej programów antywirusowych i SpamAssasinem. Wersja
 zdemonizowana.
 
 %package sendmail
 Summary:	A Mail Virus Scanner with SpamAssasin support - sendmail backend
-Summary(pl):	Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
+Summary(pl.UTF-8):	Antywirusowy skaner poczty elektronicznej - backend dla sendmaila
 Group:		Applications/Mail
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	sendmail
 
 %description sendmail
@@ -87,65 +84,60 @@ one or more virus scanners. This is daemonized version of amavis.
 
 This package contains backend for sendmail.
 
-%description sendmail -l pl
-AMaViS to skrypt po¶rednicz±cy pomiêdzy agentem transferu poczty (MTA)
-a jednym lub wiêcej programów antywirusowych. Wersja zdemonizowana.
+%description sendmail -l pl.UTF-8
+AMaViS to skrypt pośredniczący pomiędzy agentem transferu poczty (MTA)
+a jednym lub więcej programów antywirusowych. Wersja zdemonizowana.
 
 Pakiet ten zawiera back-end dla sendmaila.
 
+%package -n openldap-schema-amavisd-new
+Summary:	Amavisd-new LDAP schema
+Summary(pl.UTF-8):	Schemat LDAP dla amavisd-new
+Group:		Networking/Daemons
+Requires:	openldap-servers
+
+%description -n openldap-schema-amavisd-new
+This package contains LDAP schema for use with amavisd-new.
+
+%description -n openldap-schema-amavisd-new -l pl.UTF-8
+Ten pakiet zawiera schemat LDAP do używania z amavisd-new.
+
 %prep
-%setup -q -n %{name}-%{_real_ver}
+%setup -q
 %patch0 -p1
-# %patch1 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
-%patch3 -p1
+%patch1 -p1
 
 %build
 cd helper-progs
-%{__autoconf}
-./configure \
+%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 \
+	--with-milterlib=%{_libdir}
 %{__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},%{_tmpwatchdir}}
 
 install amavisd $RPM_BUILD_ROOT%{_sbindir}
 install amavisd-agent $RPM_BUILD_ROOT%{_sbindir}
 install amavisd-nanny $RPM_BUILD_ROOT%{_sbindir}
+install amavisd-release $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}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_tmpwatchdir}/%{name}.conf
+install -D LDAP.schema $RPM_BUILD_ROOT%{schemadir}/amavisd-new.schema
 
 %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
-else
-	/usr/sbin/useradd -u 97 -r -d %{_var}/spool/amavis -s /bin/false -c "Anti Virus Checker" -g amavis 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
@@ -155,50 +147,50 @@ fi
 
 %post
 /sbin/chkconfig --add amavisd
-if [ -f /var/lock/subsys/amavisd ]; then
-	/etc/rc.d/init.d/amavisd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
-fi
+%service amavisd restart "Amavisd daemon"
 
 %preun
-if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/amavisd ]; then
-		/etc/rc.d/init.d/amavisd stop >&2
-	fi
+if [ "$1" = "0" ]; then
+	%service amavisd stop
 	/sbin/chkconfig --del amavisd
 fi
 
 %post sendmail
 /sbin/chkconfig --add amavis-milter
-if [ -f /var/lock/subsys/amavis-milter ]; then
-	/etc/rc.d/init.d/amavis-milter restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amavis-milter start\" to start Amavis-milter daemon."
-fi
-
+%service amavis-milter restart "Amavis-milter daemon"
 
 %preun sendmail
 if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/amavis-milter ]; then
-		/etc/rc.d/init.d/amavis-milter stop >&2
-	fi
+	%service amavis-milter stop
 	/sbin/chkconfig --del amavis-milter
 fi
 
+%post -n openldap-schema-amavisd-new
+%openldap_schema_register %{schemadir}/amavisd-new.schema
+%service -q ldap restart
 
+%postun -n openldap-schema-amavisd-new
+if [ "$1" = "0" ]; then
+	%openldap_schema_unregister %{schemadir}/amavisd-new.schema
+	%service -q ldap restart
+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
+%config(noreplace) %verify(not md5 mtime size) %{_tmpwatchdir}/%{name}.conf
 %attr(750,amavis,amavis) %{_var}/spool/amavis
-%attr(755,amavis,root) %{_var}/run/amavisd
+%attr(750,amavis,amavis) %{_var}/run/amavisd
 
 %files sendmail
 %defattr(644,root,root,755)
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/amavis-milter
+%attr(754,root,root) /etc/rc.d/init.d/amavis-milter
 %attr(755,root,root) %{_sbindir}/amavis
 %attr(755,root,root) %{_sbindir}/amavis-milter
+
+%files -n openldap-schema-amavisd-new
+%defattr(644,root,root,755)
+%{schemadir}/*.schema