X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavisd-new.spec;h=7daa4b75268a4f61bc5145c86a44f306e71b423e;hb=badf355a6e30c987e0cb83a58c349ae2d77fdd91;hp=9a242753d0532918811ccd5763ee95b15c5bca17;hpb=8d1778dfd34314ee3a7d04ac5a0b579779dd667c;p=packages%2Famavisd-new.git

diff --git a/amavisd-new.spec b/amavisd-new.spec
index 9a24275..7daa4b7 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -1,28 +1,27 @@
 # TODO:
 # - Add polish info mail templates
+# - move amavis part of tmpwatch configuration from tmpwatch.spec
+#
 %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(pl.UTF-8):	Antywirusowy skaner poczty elektronicznej z obsługą SpamAssasina - demon
 Name:		amavisd-new
-Version:	2.3.3
-Release:	5
+Version:	2.6.0
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.gz
-# Source0-md5:	0b02df514c1a2bf8af346bc9c7e97111
+# Source0-md5:	71761c55054095279bda559177682164
 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
-Patch4:		%{name}-unify-log-format.patch
+Patch1:		%{name}-tools-dbdir.patch
 URL:		http://www.ijs.si/software/amavisd/
-BuildRequires:	autoconf
+BuildRequires:	libmilter-devel
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	sendmail-devel
+BuildRequires:	rpmbuild(macros) >= 1.304
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -38,10 +37,11 @@ Requires:	perl-Convert-TNEF
 Requires:	perl-Convert-UUlib >= 1.05
 Requires:	perl-MIME-tools
 Requires:	perl-Mail-SpamAssassin
-Requires:	perl-Net-Server
+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
 Provides:	group(amavis)
 Provides:	user(amavis)
@@ -58,19 +58,22 @@ 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} = %{epoch}:%{version}-%{release}
 Requires:	sendmail
@@ -81,34 +84,41 @@ 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
 %patch0 -p1
-# %patch1 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
-%patch3 -p1
-%patch4 -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/run/amavisd/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,/etc/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}
@@ -118,6 +128,8 @@ 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
@@ -152,12 +164,23 @@ if [ "$1" = "0" ];then
 	/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) /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(750,amavis,amavis) %{_var}/run/amavisd
 
@@ -166,3 +189,7 @@ fi
 %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