packages: libdbi-drivers/libdbi-drivers.spec, libdbi-drivers/libdbi-drivers...

[atler]

Author: atler                        Date: Tue Sep 21 21:52:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20100921 snap
- libdbi-destdir.patch and libdbi-docs_acfix.patch applied upstream
- copy doc BRs from libdbi (fixes doc bcond)

---- Files affected:
packages/libdbi-drivers:
   libdbi-drivers.spec (1.24 -> 1.25) , libdbi-drivers-destdir.patch (1.1 -> NONE)  (REMOVED), libdbi-drivers-docs_acfix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libdbi-drivers/libdbi-drivers.spec
diff -u packages/libdbi-drivers/libdbi-drivers.spec:1.24 packages/libdbi-drivers/libdbi-drivers.spec:1.25
--- packages/libdbi-drivers/libdbi-drivers.spec:1.24	Sun Apr 11 21:54:02 2010
+++ packages/libdbi-drivers/libdbi-drivers.spec	Tue Sep 21 23:52:12 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - add support for ingres, msql, oracle
-# - fix doc bcond build
 #
 # Conditional build:
 %bcond_without	firebird	# don't build Firebird driver
@@ -10,24 +9,38 @@
 %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_with	doc			# don't build documentation
+%bcond_without	doc			# don't build documentation
 #
-%define dbiver	0.8.4
+%define dbiver	0.9.0
 Summary:	Database Independent Abstraction Layer for C
 Summary(pl.UTF-8):	Warstwa DBI dla C
 Name:		libdbi-drivers
-%define	_snap	20090420
-Version:	0.8.4
-Release:	0.%{_snap}.3
+%define	_snap	20100921
+Version:	0.9.0
+Release:	0.%{_snap}.1
 License:	LGPL v2+
 Group:		Libraries
 #Source0:	http://dl.sourceforge.net/libdbi-drivers/libdbi-drivers-%{version}-1.tar.gz
 Source0:	%{name}-%{_snap}.tar.gz
-# Source0-md5:	c0a2dae1a28e1815353823c3fe09917f
-Patch0:		%{name}-destdir.patch
-Patch1:		%{name}-docs_acfix.patch
-Patch2:		%{name}-sqlite3_libs.patch
+# Source0-md5:	3e3b1df63ab59f9246111db7fbad8310
+Patch0:		%{name}-sqlite3_libs.patch
 URL:		http://libdbi-drivers.sourceforge.net/
+%if %{with doc}
+BuildRequires:	docbook-dtd41-sgml
+BuildRequires:	docbook-style-dsssl
+BuildRequires:	jadetex
+BuildRequires:	openjade
+BuildRequires:	texlive-fonts-ams
+BuildRequires:	texlive-fonts-marvosym
+BuildRequires:	texlive-fonts-stmaryrd
+BuildRequires:	texlive-fonts-type1-urw
+BuildRequires:	texlive-format-pdflatex
+BuildRequires:	texlive-latex-ams
+BuildRequires:	texlive-latex-extend
+BuildRequires:	texlive-latex-wasysym
+BuildRequires:	texlive-xetex
+BuildRequires:	texlive-xmltex
+%endif
 %{?with_firebird:BuildRequires:	Firebird-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -164,8 +177,6 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -218,6 +229,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/dbd/lib*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -273,6 +285,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/09/21 21:52:12  atler
+- up to 20100921 snap
+- libdbi-destdir.patch and libdbi-docs_acfix.patch applied upstream
+- copy doc BRs from libdbi (fixes doc bcond)
+
 Revision 1.24  2010/04/11 19:54:02  arekm
 - rel .3; typo fix
 
================================================================

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