From f203717baae1889c6a589ece5f37f94cd2d9cdf0 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Nov 26 2013 21:06:50 +0000
Subject: Merge


---

diff --git a/apr-util.spec b/apr-util.spec
index ae10982..5f8fef8 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -5,6 +5,12 @@
 %define dbdep libdb-devel
 %endif
 
+%if 0%{?rhel}
+%define with_freetds 0
+%else
+%define with_freetds 1
+%endif
+
 %define apuver 1
 
 Summary: Apache Portable Runtime Utility library
@@ -70,6 +76,8 @@ Requires: apr-util%{?_isa} = %{version}-%{release}
 This package provides the SQLite driver for the apr-util DBD
 (database abstraction) interface.
 
+%if %{with_freetds}
+
 %package freetds
 Group: Development/Libraries
 Summary: APR utility library FreeTDS DBD driver
@@ -80,6 +88,8 @@ Requires: apr-util%{?_isa} = %{version}-%{release}
 This package provides the FreeTDS driver for the apr-util DBD
 (database abstraction) interface.
 
+%endif
+
 %package odbc
 Group: Development/Libraries
 Summary: APR utility library ODBC DBD driver
@@ -131,7 +141,12 @@ export ac_cv_ldap_set_rebind_proc_style=three
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
         --with-ldap=ldap_r --without-gdbm \
-        --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \
+        --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
+%if %{with_freetds}
+        --with-freetds \
+%else
+        --without-freetds \
+%endif
         --with-berkeley-db \
         --without-sqlite2 \
         --with-crypto --with-openssl --with-nss
@@ -196,10 +211,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
 
+%if %{with_freetds}
+
 %files freetds
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_freetds*
 
+%endif
+
 %files odbc
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_dbd_odbc*
@@ -229,6 +248,12 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Nov 26 2013 Joe Orton <jorton@redhat.com> - 1.5.3-1
 - update to 1.5.3
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu May 09 2013 Jan Kaluza <jkaluza@redhat.com> - 1.5.2-3
+- do not build with freetds when it is not available
+
 * Tue Apr  9 2013 Joe Orton <jorton@redhat.com> - 1.5.2-2
 - update for aarch64