X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=dspam.spec;h=0c56d41a7e5b53ef3f00d59ec7505f50923ae2a4;hb=HEAD;hp=b90f561a262d8a77a7cd74a524838afe42282486;hpb=59a71e8c20ee0270ddc6705969210d4c6b1b583c;p=packages%2Fdspam.git

diff --git a/dspam.spec b/dspam.spec
index b90f561..bf936b6 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -10,23 +10,24 @@
 %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:	0.1
+Release:	8
 License:	GPL v2+
 Group:		Applications/Mail
 Source0:	http://downloads.sourceforge.net/project/dspam/dspam/%{name}-%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	10d092b57d628d8c91655fee5dc0d0cd
+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
 Patch3:		%{name}-autotools.patch
 Patch4:		%{name}-single-char-usernames.patch
-Source1:	%{name}.init
-Source2:	%{name}-apache.conf
 URL:		http://dspam.nuclearelephant.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -49,6 +50,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_webapps	/etc/webapps
 %define		_webapp		%{name}
 
+# symbols are provided by dspam executable
+%define		skip_post_check_so	libdspam.so.7.0.0 lib(hash\|mysql\|pgsql\|sqlite3)_drv.so.7.0.0
+
 %description
 DSPAM (as in De-Spam) is an open-source project to create a new kind
 of anti-spam mechanism, and is currently effective as both a
@@ -107,7 +111,7 @@ Group:		Applications/Mail
 %description common
 Common files for dspam and dspam-client packages.
 
-%description client -l pl.UTF-8
+%description common -l pl.UTF-8
 Wspólne pliki dla pakietów dspam i dspam-client.
 
 %package libs
@@ -229,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
@@ -268,6 +273,7 @@ sed -i -e 's,/usr/local/dspam/bin,/usr/bin,' ./scripts/train.pl
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 
 DRIVERS="
@@ -286,6 +292,7 @@ hash_drv
 	--with-dspam-home-group=none \
 	--with-dspam-owner=none \
 	--with-dspam-group=none \
+	--with-logdir=/var/log/%{name} \
 	--enable-ldap \
 	--enable-clamav \
 	--enable-preferences-extension \
@@ -315,9 +322,10 @@ hash_drv
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/run/dspam,/etc/{rc.d/init.d,sysconfig}} \
-	$RPM_BUILD_ROOT/var/lib/%{name}/{txt,data}
+	$RPM_BUILD_ROOT/var/lib/%{name}/{txt,data} \
+	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dspam
@@ -374,9 +382,14 @@ 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
+
+# cleanup
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/dspam/*.{a,la}
+
 %post
 /sbin/chkconfig --add dspam
 %service dspam restart "dspam daemon"
@@ -411,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
@@ -422,6 +435,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README CHANGELOG RELEASE.NOTES UPGRADING
 %doc doc/{courier,exim,markov,pop3filter,postfix,qmail,relay,sendmail}.txt
 %doc scripts/train.pl
+/usr/lib/tmpfiles.d/%{name}.conf
 %dir %attr(775,root,mail) /var/run/dspam
 %dir %attr(750,root,mail) /var/lib/%{name}
 %dir %attr(770,root,mail) /var/lib/%{name}/data
@@ -460,10 +474,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdspam.so
 %{_libdir}/libdspam.la
-%{_libdir}/dspam/libhash_drv.la
-%{_libdir}/dspam/libmysql_drv.la
-%{_libdir}/dspam/libpgsql_drv.la
-%{_libdir}/dspam/libsqlite3_drv.la
 %{_includedir}/%{name}
 %{_mandir}/man3/libdspam.3*
 %{_pkgconfigdir}/dspam.pc
@@ -471,21 +481,18 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libdspam.a
-%{_libdir}/dspam/lib*_drv.a
 
 %files driver-hash
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/css*
-%attr(755,root,root) %{_libdir}/dspam/libhash_drv.so.7.0.0
-%{_libdir}/dspam/libhash_drv.so
+%attr(755,root,root) %{_libdir}/dspam/libhash_drv.so*
 
 %if %{with mysql}
 %files driver-mysql
 %defattr(644,root,root,755)
 %doc doc/mysql_drv.txt src/tools.mysql_drv/*.sql
 %attr(640,root,mail) %config(noreplace) /var/lib/%{name}/mysql.data
-%attr(755,root,root) %{_libdir}/dspam/libmysql_drv.so.7.0.0
-%{_libdir}/dspam/libmysql_drv.so
+%attr(755,root,root) %{_libdir}/dspam/libmysql_drv.so*
 %endif
 
 %if %{with pgsql}
@@ -494,16 +501,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/pgsql_drv.txt src/tools.pgsql_drv/*.sql
 %attr(640,root,mail) %config(noreplace) /var/lib/%{name}/pgsql.data
 %attr(755,root,root) %{_bindir}/%{name}_pg2int8
-%attr(755,root,root) %{_libdir}/dspam/libpgsql_drv.so.7.0.0
-%{_libdir}/dspam/libpgsql_drv.so
+%attr(755,root,root) %{_libdir}/dspam/libpgsql_drv.so*
 %endif
 
 %if %{with sqlite}
 %files driver-sqlite3
 %defattr(644,root,root,755)
 %doc doc/sqlite_drv.txt
-%attr(755,root,root) %{_libdir}/dspam/libsqlite3_drv.so.7.0.0
-%{_libdir}/dspam/libsqlite3_drv.so
+%attr(755,root,root) %{_libdir}/dspam/libsqlite3_drv.so*
 %endif
 
 %files webui