X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavis-ng.spec;h=d750b3c08b1424961f4c2ea43843efdafb11f64c;hb=5d3d3e4920d8144988a6e48f0bf7adb5d3b76fe4;hp=48d9cc7ee83b8e86638f8f292a8b14ea393ce3bf;hpb=63639032270d88181e75455cf7ca2a525011afbc;p=packages%2Famavis-ng.git

diff --git a/amavis-ng.spec b/amavis-ng.spec
index 48d9cc7..d750b3c 100644
--- a/amavis-ng.spec
+++ b/amavis-ng.spec
@@ -3,29 +3,35 @@ Summary:	New generation amavis
 Summary(pl):	Amavis nowej generacji
 Name:		amavis-ng
 Version:	0.1.6.4.orig
-Release:	0.1
+Release:	2
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/amavis/%{name}_%{version}.tar.gz
 # Source0-md5:	b3559a910bad4a522a466da3a44e62c6
+Source1:	%{name}-logrotate
 Patch0:		%{name}-quarantine.patch
 Patch1:		%{name}-config.patch
+Patch2:		%{name}-courier.patch
+Patch3:		%{name}-mks.patch
 URL:		http://amavis.sourceforge.net/
 BuildRequires:	perl-Config-IniFiles
 BuildRequires:	perl-File-MMagic
 BuildRequires:	perl-devel
 BuildRequires:	perl-libnet
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.159
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(postun):	/usr/sbin/userdel
 Requires(postun):	/usr/sbin/groupdel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:	group(amavis)
+Provides:	user(amavis)
 Obsoletes:	amavisd
 Obsoletes:	amavis
 Obsoletes:	AMaViS
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # optionally used
 %define	_noautoreq	'perl(Archive::Tar)' 'perl(Archive::Zip)' 'perl(Compress::Zlib)' 'perl(Convert::TNEF)' 'perl(Convert::UUlib)' 'perl(MIME::Parser)' 'perl(File::Scan)'
@@ -51,6 +57,8 @@ czasie budowania.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -65,14 +73,15 @@ cd ../amavis-milter
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_infodir},%{_sbindir}}
-install -d $RPM_BUILD_ROOT/var/spool/amavis-ng/{problems,quarantine,queue}
-install -d $RPM_BUILD_ROOT/var/{run/amavis-ng,log/amavis-ng}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/logrotate.d,%{_infodir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT/var/spool/amavis-ng/{problems,quarantine,queue,tmp}
+install -d $RPM_BUILD_ROOT/var/{run/amavis-ng,log/{archiv/amavis-ng,amavis-ng}}
 install -d $RPM_BUILD_ROOT%{_datadir}/amavis-ng
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/amavis-ng
 install etc/amavis.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install doc/amavis-ng.info $RPM_BUILD_ROOT%{_infodir}
 install amavis-milter/amavis-milter $RPM_BUILD_ROOT%{_sbindir}
@@ -82,6 +91,12 @@ install magic.mime $RPM_BUILD_ROOT%{_datadir}/amavis-ng
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+if [ "$1" = "1" ]; then
+    echo
+    echo type \"info amavis-ng\" to get help
+    echo
+fi
+
 if [ -n "`getgid amavis`" ]; then
 	if [ "`getgid amavis`" != "97" ]; then
 		echo "Warning: group amavis doesn't have gid=97. Correct this before installing amavis" 1>&2
@@ -99,15 +114,16 @@ if [ -n "`id -u amavis 2>/dev/null`" ]; then
 	fi
 else
 	echo "adding user amavis UID=97"
-	/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
 
+%triggerin -- courier
+chown -R daemon /var/{spool,log}/amavis-ng
+
 %postun
 if [ "$1" = "0" ]; then
-	echo "Removing user amavis"
-	/usr/sbin/userdel amavis
-	echo "Removing group amavis"
-	/usr/sbin/groupdel amavis
+	%userremove amavis
+	%groupremove amavis
 fi
 
 %files
@@ -115,12 +131,14 @@ fi
 %doc doc/old/README* doc/ChangeLog doc/RELEASE-NOTES
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%attr(750,amavis,amavis) /var/log/amavis-ng
+%attr(770,amavis,amavis) /var/log/amavis-ng
+%attr(770,amavis,amavis) /var/log/archiv/amavis-ng
 %attr(750,amavis,amavis) /var/run/amavis-ng
-%attr(750,amavis,amavis) /var/spool/amavis-ng
+%attr(770,amavis,amavis) /var/spool/amavis-ng
 %attr(644,amavis,amavis) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/amavis.conf
 %{_datadir}/amavis-ng
 %{_infodir}/amavis-ng.info*
 %{perl_vendorlib}/AMAVIS.pm
 %{perl_vendorlib}/AMAVIS
 %{_mandir}/man1/*
+%{_sysconfdir}/logrotate.d/amavis-ng