Accepting request 357697 from home:hauky:branches:server:database

- allow building on SLES11-SP3 by removing freetds dependency
  and unknown configure option "serial-tests" for SLES11

OBS-URL: https://build.opensuse.org/request/show/357697
OBS-URL: https://build.opensuse.org/package/show/server:database/libdbi-drivers?expand=0&rev=15

configure.ac.patch

@@ -0,0 +1,11 @@
+--- libdbi-drivers/configure.ac.orig	2016-02-04 10:12:56.049468401 +0100
++++ libdbi-drivers/configure.ac	2016-02-04 10:13:10.336666283 +0100
+@@ -3,7 +3,7 @@
+ AC_CONFIG_SRCDIR([drivers/sqlite/dbd_sqlite.c])
+ AM_MAINTAINER_MODE
+ 
+-AM_INIT_AUTOMAKE([foreign dist-zip subdir-objects serial-tests])
++AM_INIT_AUTOMAKE([foreign dist-zip subdir-objects])
+ AM_CONFIG_HEADER(config.h)
+ AC_LIBTOOL_WIN32_DLL
+ AC_CONFIG_MACRO_DIR([m4])

libdbi-drivers.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  4 10:19:16 UTC 2016 - christof.hanke@rzg.mpg.de
+
+- allow building on SLES11-SP3 by removing freetds dependency
+  and unknown configure option "serial-tests" for SLES11
+
 -------------------------------------------------------------------
 Tue Nov 11 13:53:28 UTC 2014 - jengelh@inai.de
 

libdbi-drivers.spec

@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} == 1110
+%define build_freetds 0
+%else 
+%define build_freetds 1
+%endif
 
 Name:           libdbi-drivers
 Version:        0.9.0.g51
@@ -28,11 +33,16 @@ URL:            http://libdbi-drivers.sf.net/
 #Git-Clone:	git://git.code.sf.net/p/libdbi-drivers/libdbi-drivers
 #Source:        http://downloads.sf.net/libdbi-drivers/%name-%version.tar.gz
 Source:		%name-%version.tar.xz
+%if 0%{?suse_version} == 1110
+Patch1:         configure.ac.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gettext
+%if %build_freetds
 BuildRequires:  freetds-devel
+%endif
 BuildRequires:  libdbi-devel >= 0.9.0.g30
 BuildRequires:  libtool
 BuildRequires:  mysql-devel
@@ -56,6 +66,7 @@ libdbi implements a database-independent abstraction layer in C,
 similar to the DBI/DBD layer in Perl. Drivers are distributed
 separately from the library itself.
 
+%if %build_freetds
 %package dbd-freetds
 Summary:        FreeTDS driver for libdbi
 Group:          System/Libraries
@@ -65,6 +76,7 @@ This driver provides connectivity to FreeTDS database servers
 through the libdbi database independent abstraction layer. Switching
 a program's driver does not require recompilation or rewriting source
 code.
+%endif
 
 %package dbd-mysql
 Summary:        MySQL driver for libdbi
@@ -106,6 +118,9 @@ does not require recompilation or rewriting source code.
 
 %prep
 %setup -qn %name
+%if 0%{?suse_version} == 1110
+%patch1 -p1 
+%endif
 chmod a-x COPYING
 
 # Fake the __DATE__ so we do not needelessly rebuild
@@ -118,7 +133,9 @@ if [ ! -e configure ]; then
 fi
 export CFLAGS="%optflags -O0 -ggdb3"
 %configure		\
+%if %build_freetds
 	--with-freetds				\
+%endif
 	--with-mysql 				\
 	--with-pgsql 				\
 	--with-sqlite3 --with-sqlite		\
@@ -135,11 +152,13 @@ find "%buildroot" -type f -name "*.la" -delete
 %check
 make check || :
 
+%if %build_freetds
 %files dbd-freetds
 %defattr(-,root,root)
 %doc COPYING
 %dir %_libdir/dbd
 %_libdir/dbd/libdbdfreetds.so
+%endif
 
 %files dbd-mysql
 %defattr(-,root,root)