[freetds/f14/master] update to the latest stable snapshot of 0.82.1

[Dmitry Butskoy]

commit 7088b571bbff2fa82558e9a45c60e936fa2c6ec6
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date:   Wed Mar 9 20:54:15 2011 +0300

    update to the latest stable snapshot of 0.82.1

 freetds-0.82-libtool.patch   |   39 ---------------------------------------
 freetds-0.82.1-version.patch |   27 ++++++++++++++++++++++++---
 freetds.spec                 |   25 ++++++++++++++++---------
 sources                      |    2 +-
 4 files changed, 41 insertions(+), 52 deletions(-)
---
diff --git a/freetds-0.82.1-version.patch b/freetds-0.82.1-version.patch
index e113565..38f6a10 100644
--- a/freetds-0.82.1-version.patch
+++ b/freetds-0.82.1-version.patch
@@ -1,6 +1,27 @@
-diff -Nrbu freetds-0.82.1.dev.20100810/configure.ac freetds-0.82.1.dev.20100810-OK/configure.ac
---- freetds-0.82.1.dev.20100810/configure.ac	2010-08-10 12:16:15.000000000 +0400
-+++ freetds-0.82.1.dev.20100810-OK/configure.ac	2011-02-10 19:41:14.000000000 +0300
+diff -Nrbu freetds-0.82.1.dev.20110306/configure freetds-0.82.1.dev.20110306-OK/configure
+--- freetds-0.82.1.dev.20110306/configure	2011-03-07 02:25:18.000000000 +0300
++++ freetds-0.82.1.dev.20110306-OK/configure	2011-03-07 02:25:18.000000000 +0300
+@@ -699,7 +699,7 @@
+ # Identity of this package.
+ PACKAGE_NAME='FreeTDS'
+ PACKAGE_TARNAME='freetds'
+-PACKAGE_VERSION='0.82.1.dev.20110306'
++PACKAGE_VERSION='0.82.1'
+ PACKAGE_STRING='FreeTDS 0.82.1.dev.20110306'
+ PACKAGE_BUGREPORT=''
+ PACKAGE_URL=''
+@@ -3199,7 +3199,7 @@
+ 
+ # Define the identity of the package.
+  PACKAGE='freetds'
+- VERSION='0.82.1.dev.20110306'
++ VERSION='0.82.1'
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -Nrbu freetds-0.82.1.dev.20110306/configure.ac freetds-0.82.1.dev.20110306-OK/configure.ac
+--- freetds-0.82.1.dev.20110306/configure.ac	2011-03-07 02:25:06.000000000 +0300
++++ freetds-0.82.1.dev.20110306-OK/configure.ac	2011-03-07 02:25:06.000000000 +0300
 @@ -12,7 +12,7 @@
  # ------------------------------------------------------------
  # Initialization
diff --git a/freetds.spec b/freetds.spec
index 8f3fd15..f2e1c4c 100644
--- a/freetds.spec
+++ b/freetds.spec
@@ -1,4 +1,6 @@
-%define devdate	20100810
+%define devdate	20110306
+
+%bcond_with	libtds
 
 %ifarch alpha ia64 x86_64 ppc64 sparc64 s390x
 %define bits	64
@@ -9,7 +11,7 @@
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.82.1
-Release: 0.2.%{devdate}dev%{?dist}
+Release: 0.3.%{devdate}dev%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
@@ -17,13 +19,15 @@ Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-patched.tg
 Source1: freetds-tds_sysdep_public.h
 Patch0: freetds-0.82.1-version.patch
 Patch1: freetds-0.82.1-shared-libtds.patch
-Patch2: freetds-0.82-libtool.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, libtool
 
 %define fullversion	%{version}.dev.%{devdate}
  
+#  required for patch0
+%define	_default_patch_flags	-s -Z
+
 
 %description 
 FreeTDS is a project to document and implement the TDS (Tabular
@@ -56,8 +60,7 @@ If you like to develop programs using %{name}, you will need to install
 %prep 
 %setup -q -n %{name}-%{fullversion}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%{?_with_libtds:%patch1 -p1}
 
 mv doc/doc/freetds-%{fullversion} doc/doc/freetds-%{version}
 
@@ -66,11 +69,10 @@ sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl
 
 chmod -x samples/*.sh
 
-# Remove bogus libtool-related macros
-rm -f m4/lib-*.m4
-
-#  needed after patch0 and patch1...
+%if %{with libtds}
+rm -f m4/lib-*.m4	# remove bogus libtool-related macros
 autoreconf -f -i
+%endif
  
 
 %build 
@@ -139,6 +141,11 @@ rm -rf $RPM_BUILD_ROOT
  
 
 %changelog
+* Wed Mar  9 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.3.20110306dev
+- update to the latest stable snapshot 0.82.1.dev.20110306
+- make build with shared-libtds conditional
+- disable shared-libtds patch by default (seems noone uses it for now)
+
 * Mon Feb 14 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.2.20100810dev
 - fix again shared-libtds patch to provide increased library version
 
diff --git a/sources b/sources
index 22e9284..9b1838b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7183a498e7a8cedb1d361fb13901542  freetds-patched.tgz
+4db449f5ac99ba7ec5bb331a7de7abe7  freetds-patched.tgz