SPECS: dspam.spec - make it possible to have all db backend bconds...

Wed Aug 10 15:48:39 CEST 2005

Author: glen                         Date: Wed Aug 10 13:48:39 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it possible to have all db backend bconds on at same time (for future)
- fixes to make vim syntax work properly
- other cosmetics

---- Files affected:
SPECS:
   dspam.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/dspam.spec
diff -u SPECS/dspam.spec:1.36 SPECS/dspam.spec:1.37

--- SPECS/dspam.spec:1.36	Mon Aug  8 22:48:47 2005
+++ SPECS/dspam.spec	Wed Aug 10 15:48:34 2005
@@ -1,17 +1,42 @@
 # $Revision$, $Date$
+# NOTE about versioning:
+#  Stable Releases: 3.4.x, Development Releases: 3.5.x
+#  All odd-versioned minor releases are considered development
+#  releases, and all even-versioned minor releases are stable releases
+# - from http://www.nuclearelephant.com/projects/dspam/download.shtml
+#
 # TODO:
 # - everything
+# - oracle driver
 # - missing /etc/dspam.conf for cron:
 #   /etc/cron.daily/dspam:
 #    2430: [6/28/2005 1:2:1] Unable to open file for reading: /etc/dspam.conf: No such file or directory
 #    2430: [6/28/2005 1:2:1] Unable to read dspam.conf
 #
 # Conditional build:
-%bcond_without	mysql	# enable MySQL storage driver (disable sqlite driver)
-%bcond_with	pgsql	# enable PostgreSQL storage driver (disable sqlite driver)
+%bcond_without	mysql	# enable MySQL storage driver (disable sqlite/pgsql driver)
+%bcond_with	pgsql	# enable PostgreSQL storage driver (disable sqlite/mysql driver)
 %bcond_with	sqlite	# enable SQLite3 storage driver
-%bcond_with	daemon	
-#
+%bcond_with	daemon
+
+%if %{with mysql} && %{with pgsql}
+%undefine with_pgsql
+%{warn:disabled pgsql as mysql and pgsql aren't supported together (yet)
+}#'vim
+%endif
+
+%if %{with mysql} && %{with sqlite}
+%undefine with_sqlite
+%{warn:disabled sqlite as mysql and sqlite aren't supported together (yet)
+}#'vim
+%endif
+
+%if %{with pgsql} && %{with sqlite}
+%undefine with_sqlite
+%{warn:disabled sqlite as pgsql and sqlite aren't supported together (yet)
+}#'vim
+%endif
+
 
 %if %{with mysql} || %{with pgsql}
 %define	with_daemon 1
@@ -21,7 +46,7 @@
 Summary(pl):	Biblioteka i MDA do bayesowskiego filtrowania spamu
 Name:		dspam
 Version:	3.4.9
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://www.nuclearelephant.com/projects/dspam/sources/%{name}-%{version}.tar.gz
@@ -31,17 +56,9 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
-%if %{with mysql}
-BuildRequires:	mysql-devel
-%else
-%if %{with pgsql}
-BuildRequires:	postgresql-devel
-%else
-%if %{with sqlite}
-BuildRequires:	sqlite3-devel
-%endif
-%endif
-%endif
+%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_pgsql:BuildRequires:	postgresql-devel}
+%{?with_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	sed >= 4.0
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -182,21 +199,19 @@
 	--with-storage-driver=mysql_drv \
 	--with-mysql-includes=%{_includedir}/mysql \
 	--with-mysql-libraries=%{_libdir}
-%else
+%endif
 %if %{with pgsql}
 	--enable-daemon \
 	--enable-virtual-users \
 	--with-storage-driver=pgsql_drv \
 	--with-pgsql-includes=%{_includedir}/postgresql \
 	--with-pgsql-libraries=%{_libdir}
-%else
+%endif
 %if %{with sqlite}
 	--with-storage-driver=sqlite3_drv \
 	--with-sqlite3-includes=%{_includedir} \
 	--with-sqlite3-libraries=%{_libdir}
 %endif
-%endif
-%endif
 %{__make}
 
 %install
@@ -205,7 +220,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dspam
 
@@ -270,20 +284,19 @@
 %post
 /sbin/chkconfig --add dspam
 if [ -f /var/lock/subsys/dspam ]; then
-        /etc/rc.d/init.d/dspam restart 1>&2
+	/etc/rc.d/init.d/dspam restart 1>&2
 else
-        echo "Run \"/etc/rc.d/init.d/dspam start\" to start dspam daemon."
+	echo "Run \"/etc/rc.d/init.d/dspam start\" to start dspam daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/dspam ]; then
-                /etc/rc.d/init.d/dspam stop 1>&2
-        fi
-        /sbin/chkconfig --del dspam
+	if [ -f /var/lock/subsys/dspam ]; then
+		/etc/rc.d/init.d/dspam stop 1>&2
+	fi
+	/sbin/chkconfig --del dspam
 fi
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -302,7 +315,7 @@
 %doc doc/pgsql_drv.txt
 %doc src/tools.pgsql_drv/*.sql
 %endif
-%if %{!with mysql} && %{!with pgsql}
+%if %{without mysql} && %{without pgsql}
 %doc doc/sqlite_drv.txt
 %endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dspam.conf
@@ -355,6 +368,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2005/08/10 13:48:34  glen
+- make it possible to have all db backend bconds on at same time (for future)
+- fixes to make vim syntax work properly
+- other cosmetics
+
 Revision 1.36  2005/08/08 20:48:47  arekm
 - up to 3.4.9
 
@@ -368,7 +386,7 @@
 - mysql version is default now; sqlite2 support dropped; daemon mode enabled for mysql and postgresql
 
 Revision 1.32  2005/06/17 06:29:18  arekm
-sqlite3 by default
+- sqlite3 by default
 
 Revision 1.31  2005/06/17 06:25:16  arekm
 - up to 3.4.8
@@ -377,7 +395,7 @@
 - up to 3.4.6
 
 Revision 1.29  2005/04/15 06:18:44  charles
-- fix %%files
+- fix %files
 
 Revision 1.28  2005/04/11 18:36:31  darekr
 - one more dup file
@@ -386,7 +404,7 @@
 - killed dup files
 
 Revision 1.26  2005/04/11 18:16:08  darekr
-- killed setting perms in %%install
+- killed setting perms in %install
 - removed dup config file
 
 Revision 1.25  2005/04/11 18:05:53  paszczus
@@ -429,7 +447,7 @@
 - updated to 3.2.4
 
 Revision 1.14  2004/11/22 11:02:55  malekith
-- fix the %%if syntax in the BR section
+- fix the %if syntax in the BR section
 
 Revision 1.13  2004/11/01 12:56:29  paszczus
 - updated to 3.2.1
@@ -445,7 +463,7 @@
 - fix the cron daily script -- it needs parameters and doesn't produce any output
 
 Revision 1.9  2004/10/15 09:40:48  malekith
-- fix the %%if syntax, db4 driver works again
+- fix the %if syntax, db4 driver works again
 
 Revision 1.8  2004/08/17 14:34:19  paszczus
 - added pgsql support (by konrad (at) rzentarzewski.net)
@@ -465,7 +483,7 @@
 Revision 1.4  2004/05/20 18:20:19  pluto
 - mysql xor db4 support added.
 - BR: fixed.
-- %%install NFY...
+- %install NFY...
 
 Revision 1.3  2004/05/20 17:19:17  pluto
 - md5.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dspam.spec?r1=1.36&r2=1.37&f=u


