- update to 3.8.0-STABLE

[packages/dspam.git] / dspam.spec

diff --git a/dspam.spec b/dspam.spec
index c077f7bdf8219735e3557937f37b6ceeac182c45..381c7b2609a98253aaf7c1a3e0684314ad5db029 100644 (file)
--- a/dspam.spec
+++ b/dspam.spec
@@ -17,12 +17,12 @@
 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.6.8
+Version:       3.8.0
 Release:       0.1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://dspam.nuclearelephant.com/sources/%{name}-%{version}.tar.gz
-# Source0-md5: c4b1a7079690ee16d8b0f36b2a2a90a4
+# Source0-md5: 056b8c8b3ad9415a52c01b22ff1e64cf
 Patch0:                %{name}-webui.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-speedup.patch
@@ -42,6 +42,7 @@ BuildRequires:        sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite3-devel}
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name}-driver = %{version}-%{release}
 Requires:      rc-scripts
 Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -104,7 +105,6 @@ Klient dspam.
 Summary:       A library for Bayesian spam filtering
 Summary(pl.UTF-8):     Biblioteka do bayesowskiego filtrowania spamu
 Group:         Libraries
-Requires:      %{name}-driver = %{version}-%{release}
 Obsoletes:     dspam-driver-db
 
 %description libs
@@ -161,7 +161,7 @@ Summary:    HASH driver for DSPAM
 Summary(pl.UTF-8):     Sterownik HASH dla DSPAM-a
 Group:         Libraries
 Requires(post):        sed >= 4.0
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-driver = %{version}-%{release}
 
 %description driver-hash
@@ -175,7 +175,7 @@ Summary:    MySQL driver for DSPAM
 Summary(pl.UTF-8):     Sterownik MySQL dla DSPAM-a
 Group:         Libraries
 Requires(post):        sed >= 4.0
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-driver = %{version}-%{release}
 
 %description driver-mysql
@@ -189,7 +189,7 @@ Summary:    PostgreSQL driver for DSPAM
 Summary(pl.UTF-8):     Sterownik PostgreSQL dla DSPAM-a
 Group:         Libraries
 Requires(post):        sed >= 4.0
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-driver = %{version}-%{release}
 
 %description driver-pgsql
@@ -203,7 +203,7 @@ Summary:    SQLite driver for DSPAM
 Summary(pl.UTF-8):     Sterownik SQLite dla DSPAM-a
 Group:         Libraries
 Requires(post):        sed >= 4.0
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-driver = %{version}-%{release}
 
 %description driver-sqlite
@@ -386,24 +386,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun        libs -p /sbin/ldconfig
 
 %post driver-hash
-if [ "$1" = "1" ]; then
-       sed -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libhash_drv.so,' /etc/dspam.conf
-fi
+%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libhash_drv.so,' /etc/dspam.conf
 
 %post driver-mysql
-if [ "$1" = "1" ]; then
-       sed -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libmysql_drv.so,' /etc/dspam.conf
-fi
+%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libmysql_drv.so,' /etc/dspam.conf
 
 %post driver-pgsql
-if [ "$1" = "1" ]; then
-       sed -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libpgsql_drv.so,' /etc/dspam.conf
-fi
+%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libpgsql_drv.so,' /etc/dspam.conf
 
 %post driver-sqlite
-if [ "$1" = "1" ]; then
-       sed -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libsqlite_drv.so,' /etc/dspam.conf
-fi
+%{__sed} -i -e '/^StorageDriver/s,/.*\.so,%{_libdir}/libsqlite_drv.so,' /etc/dspam.conf
 
 %triggerin webui -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}