SPECS: libdbi-drivers.spec - up to snap 20090420 - fixed sqlite3 building -...

[mmazur]

Author: mmazur                       Date: Tue Apr 21 09:11:22 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to snap 20090420
- fixed sqlite3 building
- added (incomplete, no BRs) doc bcond

---- Files affected:
SPECS:
   libdbi-drivers.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/libdbi-drivers.spec
diff -u SPECS/libdbi-drivers.spec:1.20 SPECS/libdbi-drivers.spec:1.21
--- SPECS/libdbi-drivers.spec:1.20	Mon Apr 20 12:45:59 2009
+++ SPECS/libdbi-drivers.spec	Tue Apr 21 11:11:16 2009
@@ -8,18 +8,23 @@
 %bcond_without	pgsql		# don't build PostgreSQL driver
 %bcond_without	sqlite		# don't build sqlite driver
 %bcond_without	sqlite3		# don't build sqlite3 driver
+%bcond_without	doc			# don't build documentation
 #
-%define dbiver	0.8.3
+%define dbiver	0.8.4
 Summary:	Database Independent Abstraction Layer for C
 Summary(pl.UTF-8):	Warstwa DBI dla C
 Name:		libdbi-drivers
-Version:	0.8.3
-Release:	1
+%define	_snap	20090420
+Version:	0.8.4
+Release:	0.%{_snap}.1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/libdbi-drivers/libdbi-drivers-%{version}-1.tar.gz
+#Source0:	http://dl.sourceforge.net/libdbi-drivers/libdbi-drivers-%{version}-1.tar.gz
+Source0:	%{name}-%{_snap}.tar.gz
 # Source0-md5:	4de79b323162a5a7652b65b608eca6cd
-Patch0:		%{name}-opt.patch
+Patch0:		%{name}-destdir.patch
+Patch1:		%{name}-docs_acfix.patch
+Patch2:		%{name}-sqlite3_libs.patch
 URL:		http://libdbi-drivers.sourceforge.net/
 %{?with_firebird:BuildRequires:	Firebird-devel}
 BuildRequires:	autoconf
@@ -155,8 +160,10 @@
 zmiany źródeł programu.
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -166,6 +173,7 @@
 %{__automake}
 %configure \
 	--disable-static \
+	%{!?with_doc:--disable-docs} \
 %if %{with firebird}
 	--with-firebird \
 	--with-firebird-libdir=%{_libdir} \
@@ -191,7 +199,7 @@
 	--with-sqlite-libdir=%{_libdir} \
 	--with-sqlite-incdir=%{_includedir} \
 %endif
-%if %{with sqlite}
+%if %{with sqlite3}
 	--with-sqlite3 \
 	--with-sqlite3-libdir=%{_libdir} \
 	--with-sqlite3-incdir=%{_includedir} \
@@ -218,7 +226,7 @@
 %if %{with firebird}
 %files firebird
 %defattr(644,root,root,755)
-%doc drivers/firebird/{AUTHORS,README,TODO,dbd_firebird}
+%doc drivers/firebird/{AUTHORS,README,TODO%{?with_doc:,dbd_firebird}}
 %attr(755,root,root) %{_libdir}/dbd/libdbdfirebird.so
 %endif
 
@@ -232,28 +240,28 @@
 %if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
-%doc drivers/mysql/{AUTHORS,README,TODO,dbd_mysql.pdf,dbd_mysql}
+%doc drivers/mysql/{AUTHORS,README,TODO%{?with_doc:,dbd_mysql.pdf,dbd_mysql}}
 %attr(755,root,root) %{_libdir}/dbd/libdbdmysql.so
 %endif
 
 %if %{with pgsql}
 %files pgsql
 %defattr(644,root,root,755)
-%doc drivers/pgsql/{AUTHORS,README,TODO,dbd_pgsql.pdf,dbd_pgsql}
+%doc drivers/pgsql/{AUTHORS,README,TODO%{?with_doc:,dbd_pgsql.pdf,dbd_pgsql}}
 %attr(755,root,root) %{_libdir}/dbd/libdbdpgsql.so
 %endif
 
 %if %{with sqlite}
 %files sqlite
 %defattr(644,root,root,755)
-%doc drivers/sqlite/{AUTHORS,README,TODO,dbd_sqlite.pdf,dbd_sqlite}
+%doc drivers/sqlite/{AUTHORS,README,TODO%{?with_doc:,dbd_sqlite.pdf,dbd_sqlite}}
 %attr(755,root,root) %{_libdir}/dbd/libdbdsqlite.so
 %endif
 
 %if %{with sqlite3}
 %files sqlite3
 %defattr(644,root,root,755)
-%doc drivers/sqlite3/{AUTHORS,README,TODO,dbd_sqlite3.pdf,dbd_sqlite3}
+%doc drivers/sqlite3/{AUTHORS,README,TODO%{?with_doc:,dbd_sqlite3.pdf,dbd_sqlite3}}
 %attr(755,root,root) %{_libdir}/dbd/libdbdsqlite3.so
 %endif
 
@@ -263,6 +271,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/04/21 09:11:16  mmazur
+- up to snap 20090420
+- fixed sqlite3 building
+- added (incomplete, no BRs) doc bcond
+
 Revision 1.20  2009/04/20 10:45:59  mmazur
 - fix 64bit build; stbr th
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libdbi-drivers.spec?r1=1.20&r2=1.21&f=u