- updated to 1.00.13

- updated no-Llibdir patch
- default protocol version to auto

diff --git a/freetds-no-Llibdir.patch b/freetds-no-Llibdir.patch
index 1661d7f8adf28186f98b6d672c4f2a73c7f62969..b5202e210e7e54d677c25e05d792e57021b28c80 100644 (file)
--- a/freetds-no-Llibdir.patch
+++ b/freetds-no-Llibdir.patch
@@ -13,13 +13,13 @@
        fi
        test -r "$ODBC_INC/sql.h" || AC_ERROR([sql.h not found])
        test -r "$ODBC_INC/sqlext.h" || AC_ERROR([sqlext.h not found])
---- freetds-0.95.8/m4/check_openssl.m4.orig    2015-05-05 19:54:59.000000000 +0200
-+++ freetds-0.95.8/m4/check_openssl.m4 2015-06-25 21:13:31.026538747 +0200
+--- freetds-1.00.13/m4/check_openssl.m4.orig   2016-07-29 19:20:01.111369876 +0200
++++ freetds-1.00.13/m4/check_openssl.m4        2016-07-29 19:20:37.874702783 +0200
 @@ -18,7 +18,6 @@
-     else
-         echo "OpenSSL found in $ssldir"
-         NETWORK_LIBS="$NETWORK_LIBS -lssl -lcrypto"
--        LDFLAGS="$LDFLAGS -L$ssldir/lib"
-         HAVE_OPENSSL=yes
-         AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have the OpenSSL.])
-     fi
+                 found_ssl="yes"
+                 CFLAGS="$CFLAGS -I$ssldir/include"
+                 NETWORK_LIBS="$NETWORK_LIBS -lssl -lcrypto"
+-                LDFLAGS="$LDFLAGS -L$ssldir/lib"
+                 break
+             fi
+         done

diff --git a/freetds.spec b/freetds.spec
index da8cf34ae3f0ed79108adc139cbace80a8adcb80..e86839f63b7ce63931c59fe949a94f4d8912b87a 100644 (file)
--- a/freetds.spec
+++ b/freetds.spec
@@ -4,36 +4,37 @@
 %bcond_without kerberos5       # Kerberos5 support (via Heimdal)
 #
 # %%define tdsver - default protocol version; valid versions:
+# auto (default)
 # 4.2 (used by Sybase SQLServer <= 10 and MS SQL Server 6.5)
 # 4.6
 # 5.0 (used by Sybase SQLServer >= 11)
-# 7.0 (used by MS SQL Server 7.0) [spec default]
+# 7.0 (used by MS SQL Server 7.0)
 # 7.1 (used by MS SQL Server 2000)
 # 7.2 (used by MS SQL Server 2005)
 # 7.3 (used by MS SQL Server 2008)
-# [7.4 (used by MS SQL Server 2012/2014) not supported yet]
-
-%{!?tdsver:%define tdsver 7.0}
+# 7.4 (used by MS SQL Server 2012/2014)
 
 Summary:       Free implementation of Sybase's db-lib
 Summary(pl.UTF-8):     Wolnodostępna implementacja db-lib firmy Sybase
 Name:          freetds
-Version:       0.95.80
+Version:       1.00.13
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.bz2
-# Source0-md5: aae6a130cd30fc61af4ee5de228e142c
+# Source0-md5: 5aec03ac89d3b7026acaac5b6b0aaba4
 Patch0:                %{name}-reserved.patch
 Patch1:                %{name}-no-Llibdir.patch
 URL:           http://www.freetds.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
+BuildRequires: doxygen
 BuildRequires: gettext-tools
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
-BuildRequires: libltdl-devel
-BuildRequires: libtool
+BuildRequires: libltdl-devel >= 2:2
+BuildRequires: libtool >= 2:2
 BuildRequires: openssl-devel
+BuildRequires: readline-devel
 BuildRequires: unixODBC-devel
 Requires(post):        /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -112,7 +113,7 @@ Sterownik ODBC FreeTDS dla unixODBC.
        --disable-silent-rules \
        %{?with_msdblib:--with-msdblib} \
        --with-openssl \
-       --with-tdsver=%{tdsver} \
+       %{?tdsver:--with-tdsver=%{tdsver}} \
        --with-unixodbc=/usr
 
 %{__make}