- drop obsolete and outdated manual inclusion of rpm macros

[packages/dspam.git] / dspam.spec

diff --git a/dspam.spec b/dspam.spec
index c69391723e3311f2e02f459b09d87d4ead8a1bc9..bf936b6091e3bece42937a8243c0644ccf7351b3 100644 (file)
--- a/dspam.spec
+++ b/dspam.spec
@@ -10,12 +10,11 @@
 %bcond_without sqlite  # disable SQLite3 storage driver
 %bcond_with    mysql40 # use with mysql 4.0
 
-%include       /usr/lib/rpm/macros.perl
 Summary:       A library and Mail Delivery Agent for Bayesian spam filtering
 Summary(pl.UTF-8):     Biblioteka i MDA do bayesowskiego filtrowania spamu
 Name:          dspam
 Version:       3.9.0
-Release:       6
+Release:       8
 License:       GPL v2+
 Group:         Applications/Mail
 Source0:       http://downloads.sourceforge.net/project/dspam/dspam/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -23,6 +22,7 @@ Source0:      http://downloads.sourceforge.net/project/dspam/dspam/%{name}-%{version}
 Source1:       %{name}.init
 Source2:       %{name}-apache.conf
 Source3:       %{name}.tmpfiles
+Source4:       %{name}-httpd.conf
 Patch0:                %{name}-webui.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-speedup.patch
@@ -233,6 +233,7 @@ Group:              Applications/WWW
 Requires:      webapps
 # needs dspam binary
 Requires:      %{name} = %{version}-%{release}
+Conflicts:     apache-base < 2.4.0-1
 
 %description webui
 The Web UI (CGI client) can be run from any executable location on a
@@ -381,7 +382,7 @@ EOF
 
 install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 touch $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/htpasswd
 
 install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
@@ -423,10 +424,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun webui -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin webui -- apache < 2.2.0, apache-base
+%triggerin webui -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun webui -- apache < 2.2.0, apache-base
+%triggerun webui -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files