- fix mks options; add mks to config

[packages/amavis-ng.git] / amavis-ng.spec

diff --git a/amavis-ng.spec b/amavis-ng.spec
index d39a5f94421d9fb196824a0c404cfbd341dfe992..48d9cc7ee83b8e86638f8f292a8b14ea393ce3bf 100644 (file)
--- a/amavis-ng.spec
+++ b/amavis-ng.spec
@@ -2,13 +2,14 @@
 Summary:       New generation amavis
 Summary(pl):   Amavis nowej generacji
 Name:          amavis-ng
-Version:       0.1.4.1.orig
-Release:       3
+Version:       0.1.6.4.orig
+Release:       0.1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://dl.sourceforge.net/amavis/%{name}_%{version}.tar.gz
-# Source0-md5: cb194e571b3de9ec1fef489bb812579e
-Patch0:                %{name}.patch
+# Source0-md5: b3559a910bad4a522a466da3a44e62c6
+Patch0:                %{name}-quarantine.patch
+Patch1:                %{name}-config.patch
 URL:           http://amavis.sourceforge.net/
 BuildRequires: perl-Config-IniFiles
 BuildRequires: perl-File-MMagic
@@ -49,19 +50,34 @@ czasie budowania.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \
        INSTALLDIRS=vendor
 %{__make}
 
+cd doc
+%{__make}
+
+cd ../amavis-milter
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $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%{_datadir}/amavis-ng
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+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}
+install magic.mime $RPM_BUILD_ROOT%{_datadir}/amavis-ng
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -96,11 +112,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*
+%doc doc/old/README* doc/ChangeLog doc/RELEASE-NOTES
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%{_datadir}/amavis
-%attr(750,amavis,sweep) /var/spool/amavis
+%attr(750,amavis,amavis) /var/log/amavis-ng
+%attr(750,amavis,amavis) /var/run/amavis-ng
+%attr(750,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/*