[freetds/f13/master] update to the latest stable snapshot of 0.82.1 (dev.20100810)
Dmitry Butskoy
buc at fedoraproject.org
Thu Feb 10 18:26:21 UTC 2011
commit b4e144e9e23f2b9a160530d8feffe734e3fd0ee5
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Feb 10 21:25:54 2011 +0300
update to the latest stable snapshot of 0.82.1 (dev.20100810)
cspublic.BLK_VERSION_150.patch | 29 -----
...tds.patch => freetds-0.82.1-shared-libtds.patch | 109 ++++++++++----------
freetds-0.82.1-version.patch | 12 ++
freetds.spec | 35 +++++--
4 files changed, 90 insertions(+), 95 deletions(-)
---
diff --git a/freetds-0.82-shared-libtds.patch b/freetds-0.82.1-shared-libtds.patch
similarity index 55%
rename from freetds-0.82-shared-libtds.patch
rename to freetds-0.82.1-shared-libtds.patch
index a9a1245..8fa26cb 100644
--- a/freetds-0.82-shared-libtds.patch
+++ b/freetds-0.82.1-shared-libtds.patch
@@ -1,8 +1,27 @@
-diff -up freetds-0.82/src/apps/Makefile.am.foo freetds-0.82/src/apps/Makefile.am
---- freetds-0.82/src/apps/Makefile.am.foo 2008-06-16 23:25:29.000000000 +0200
-+++ freetds-0.82/src/apps/Makefile.am 2008-06-16 23:25:34.000000000 +0200
-@@ -19,7 +19,7 @@ dist_bin_SCRIPTS = osql
- freebcp_LDADD = ../dblib/libsybdb.la $(NETWORK_LIBS)
+diff -Nrbu freetds-0.82.1.dev.20100810/include/Makefile.am freetds-0.82.1.dev.20100810-OK/include/Makefile.am
+--- freetds-0.82.1.dev.20100810/include/Makefile.am 2008-08-07 15:26:55.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/include/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -3,6 +3,7 @@
+ include_HEADERS = bkpublic.h cspublic.h cstypes.h ctpublic.h \
+ sqldb.h sqlfront.h \
+ sybdb.h sybfront.h \
++ tds.h tdsver.h tdsconvert.h \
+ syberror.h
+
+ nodist_include_HEADERS = tds_sysdep_public.h
+@@ -19,7 +20,6 @@
+ tdsthread.h \
+ tdsbytes.h \
+ replacements/readpassphrase.h \
+- tds.h tdsver.h tdsconvert.h \
+ tdssrv.h
+
+ DISTCLEANFILES = tds_sysdep_public.h freetds_sysconfdir.h
+diff -Nrbu freetds-0.82.1.dev.20100810/src/apps/Makefile.am freetds-0.82.1.dev.20100810-OK/src/apps/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/apps/Makefile.am 2010-07-28 16:35:50.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/apps/Makefile.am 2011-02-10 19:12:08.000000000 +0300
+@@ -19,7 +19,7 @@
+ freebcp_LDADD = ../dblib/libsybdb.la ../replacements/libreplacements.la $(LIBICONV) $(NETWORK_LIBS)
freebcp_SOURCES = freebcp.c freebcp.h
-tsql_LDADD = ../tds/libtds.la \
@@ -10,30 +29,30 @@ diff -up freetds-0.82/src/apps/Makefile.am.foo freetds-0.82/src/apps/Makefile.am
../replacements/libreplacements.la \
$(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC) $(READLINE_LIBS)
-diff -up freetds-0.82/src/ctlib/Makefile.am.foo freetds-0.82/src/ctlib/Makefile.am
---- freetds-0.82/src/ctlib/Makefile.am.foo 2008-06-16 23:25:23.000000000 +0200
-+++ freetds-0.82/src/ctlib/Makefile.am 2008-06-16 23:25:27.000000000 +0200
-@@ -18,5 +18,5 @@ SYMBOLS = -export-symbols-regex '^(cs_|
+diff -Nrbu freetds-0.82.1.dev.20100810/src/ctlib/Makefile.am freetds-0.82.1.dev.20100810-OK/src/ctlib/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/ctlib/Makefile.am 2007-11-22 11:44:54.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/ctlib/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -18,5 +18,5 @@
endif
libct_la_LDFLAGS= -version-info 4:0:0 $(SYMBOLS) $(FREETDS_SYMBOLIC)
-libct_la_LIBADD = ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libct_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
-diff -up freetds-0.82/src/dblib/Makefile.am.foo freetds-0.82/src/dblib/Makefile.am
---- freetds-0.82/src/dblib/Makefile.am.foo 2008-06-16 23:25:40.000000000 +0200
-+++ freetds-0.82/src/dblib/Makefile.am 2008-06-16 23:25:49.000000000 +0200
-@@ -20,5 +20,5 @@ else
+diff -Nrbu freetds-0.82.1.dev.20100810/src/dblib/Makefile.am freetds-0.82.1.dev.20100810-OK/src/dblib/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/dblib/Makefile.am 2007-11-22 11:44:54.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/dblib/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -20,5 +20,5 @@
SYMBOLS = -export-symbols-regex '^(db|bcp_|tdsdump_open|tdsdbopen|.*_xact|close_commit|open_commit|.?asprintf).*'
endif
libsybdb_la_LDFLAGS= -version-info 5:0:0 $(SYMBOLS) $(FREETDS_SYMBOLIC)
-libsybdb_la_LIBADD= ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libsybdb_la_LIBADD= ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
-diff -up freetds-0.82/src/odbc/Makefile.am.foo freetds-0.82/src/odbc/Makefile.am
---- freetds-0.82/src/odbc/Makefile.am.foo 2008-06-16 23:25:14.000000000 +0200
-+++ freetds-0.82/src/odbc/Makefile.am 2008-06-16 23:25:20.000000000 +0200
-@@ -13,14 +13,14 @@ libtdsodbc_la_SOURCES= odbc.c connectpar
+diff -Nrbu freetds-0.82.1.dev.20100810/src/odbc/Makefile.am freetds-0.82.1.dev.20100810-OK/src/odbc/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/odbc/Makefile.am 2007-12-03 21:55:09.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/odbc/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -13,14 +13,14 @@
descriptor.c prepare_query.c odbc_util.c \
native.c sql2tds.c error.c odbc_checks.c $(MINGW_SOURCES)
if MINGW32
@@ -50,9 +69,9 @@ diff -up freetds-0.82/src/odbc/Makefile.am.foo freetds-0.82/src/odbc/Makefile.am
if MACOSX
SYMBOLS =
else
-diff -up freetds-0.82/src/server/Makefile.am.foo freetds-0.82/src/server/Makefile.am
---- freetds-0.82/src/server/Makefile.am.foo 2008-06-16 23:25:06.000000000 +0200
-+++ freetds-0.82/src/server/Makefile.am 2008-06-16 23:25:12.000000000 +0200
+diff -Nrbu freetds-0.82.1.dev.20100810/src/server/Makefile.am freetds-0.82.1.dev.20100810-OK/src/server/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/server/Makefile.am 2010-07-28 16:35:50.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/server/Makefile.am 2011-02-10 19:11:09.000000000 +0300
@@ -2,7 +2,7 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libtdssrv.la
@@ -60,25 +79,24 @@ diff -up freetds-0.82/src/server/Makefile.am.foo freetds-0.82/src/server/Makefil
-libtdssrv_la_LIBADD = ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+libtdssrv_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
noinst_PROGRAMS = tdssrv
- tdssrv_LDADD = libtdssrv.la $(NETWORK_LIBS)
+ tdssrv_LDADD = libtdssrv.la $(LIBICONV) $(NETWORK_LIBS)
tdssrv_SOURCES = unittest.c
-diff -up freetds-0.82/src/tds/Makefile.am.foo freetds-0.82/src/tds/Makefile.am
---- freetds-0.82/src/tds/Makefile.am.foo 2007-10-30 16:51:06.000000000 +0100
-+++ freetds-0.82/src/tds/Makefile.am 2008-06-16 23:23:50.000000000 +0200
-@@ -3,15 +3,25 @@
+diff -Nrbu freetds-0.82.1.dev.20100810/src/tds/Makefile.am freetds-0.82.1.dev.20100810-OK/src/tds/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/tds/Makefile.am 2008-08-07 15:26:59.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/tds/Makefile.am 2011-02-10 19:14:45.000000000 +0300
+@@ -3,15 +3,24 @@
SUBDIRS = unittests
AM_CPPFLAGS = -I$(top_srcdir)/include
-noinst_LTLIBRARIES = libtds.la
-libtds_la_SOURCES= mem.c token.c util.c login.c read.c \
-+
+noinst_LTLIBRARIES = libtds_objects.la
-+libtds_objects_la_SOURCES = mem.c token.c util.c login.c read.c \
++libtds_objects_la_SOURCES= mem.c token.c util.c login.c read.c \
write.c convert.c numeric.c config.c query.c iconv.c \
locale.c challenge.c threadsafe.c vstrbuild.c md4.c md5.c \
des.c tdsstring.c getmac.c data.c net.c \
tds_checks.c tds_checks.h enum_cap.h log.c \
- gssapi.c
+ gssapi.c hmac_md5.c
-libtds_la_LDFLAGS=
-libtds_la_LIBADD=
+libtds_objects_la_LDFLAGS=
@@ -87,40 +105,21 @@ diff -up freetds-0.82/src/tds/Makefile.am.foo freetds-0.82/src/tds/Makefile.am
+
+lib_LTLIBRARIES = libtds.la
+libtds_la_SOURCES =
-+libtds_la_LDFLAGS = -release @PACKAGE_VERSION@ \
-+ -export-symbols-regex '^(tds_|tdsdump_|tds5_|tds7_).*'
++libtds_la_LDFLAGS = -version-info 5:0:0 \
++ -export-symbols-regex '^(tds_|tdsdump_|tds5_|tds7_).*'
+libtds_la_LIBADD = libtds_objects.la ../replacements/libreplacements.la \
+ $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+
noinst_HEADERS = tds_willconvert.h encodings.h num_limits.h
EXTRA_DIST = tds_willconvert.h encodings.h num_limits.h
-diff -up freetds-0.82/src/tds/unittests/Makefile.am.foo freetds-0.82/src/tds/unittests/Makefile.am
---- freetds-0.82/src/tds/unittests/Makefile.am.foo 2008-06-16 23:24:34.000000000 +0200
-+++ freetds-0.82/src/tds/unittests/Makefile.am 2008-06-16 23:24:54.000000000 +0200
-@@ -35,5 +35,5 @@ AM_LDFLAGS = -no-fast-install
+diff -Nrbu freetds-0.82.1.dev.20100810/src/tds/unittests/Makefile.am freetds-0.82.1.dev.20100810-OK/src/tds/unittests/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/tds/unittests/Makefile.am 2010-07-31 12:05:20.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/tds/unittests/Makefile.am 2011-02-10 19:15:31.000000000 +0300
+@@ -35,5 +35,5 @@
else
AM_LDFLAGS = -no-install
endif
--LIBS = ../libtds.la ../../replacements/libreplacements.la @NETWORK_LIBS@
-+LIBS = ../libtds_objects.la ../../replacements/libreplacements.la @NETWORK_LIBS@
+-LIBS = ../libtds.la ../../replacements/libreplacements.la $(LIBICONV) @NETWORK_LIBS@
++LIBS = ../libtds_objects.la ../../replacements/libreplacements.la $(LIBICONV) @NETWORK_LIBS@
CLEANFILES = tdsdump.out
-diff -up freetds-0.82/include/Makefile.am~ freetds-0.82/include/Makefile.am
---- freetds-0.82/include/Makefile.am~ 2008-06-16 23:35:45.000000000 +0200
-+++ freetds-0.82/include/Makefile.am 2008-06-16 23:38:41.000000000 +0200
-@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = 1.5.3
- include_HEADERS = bkpublic.h cspublic.h cstypes.h ctpublic.h \
- sqldb.h sqlfront.h \
- sybdb.h sybfront.h \
-+ tds.h tdsver.h tdsconvert.h \
- syberror.h
-
- nodist_include_HEADERS = tds_sysdep_public.h
-@@ -19,7 +20,6 @@ noinst_HEADERS = tds_configs.h \
- tdsthread.h \
- tdsbytes.h \
- replacements/readpassphrase.h \
-- tds.h tdsver.h tdsconvert.h \
- tdssrv.h
-
- DISTCLEANFILES = tds_sysdep_public.h freetds_sysconfdir.h
diff --git a/freetds-0.82.1-version.patch b/freetds-0.82.1-version.patch
new file mode 100644
index 0000000..e113565
--- /dev/null
+++ b/freetds-0.82.1-version.patch
@@ -0,0 +1,12 @@
+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
+@@ -12,7 +12,7 @@
+ # ------------------------------------------------------------
+ # Initialization
+ # ------------------------------------------------------------
+-AC_INIT(FreeTDS, 0.82.1.dev.esyscmd(echo -n $(date +"%Y%m%d")))
++AC_INIT(FreeTDS, 0.82.1)
+ AC_CONFIG_SRCDIR(src/dblib/dblib.c)
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.29.2.15 $)
diff --git a/freetds.spec b/freetds.spec
index 809c6d5..afa8f48 100644
--- a/freetds.spec
+++ b/freetds.spec
@@ -1,3 +1,5 @@
+%define devdate 20100810
+
%ifarch alpha ia64 x86_64 ppc64 sparc64 s390x
%define bits 64
%else
@@ -6,19 +8,21 @@
Name: freetds
Summary: Implementation of the TDS (Tabular DataStream) protocol
-Version: 0.82
-Release: 6%{?dist}
+Version: 0.82.1
+Release: 0.1.%{devdate}dev%{?dist}
Group: System Environment/Libraries
License: LGPLv2+ and GPLv2+
URL: http://www.freetds.org/
-Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.gz
+Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-patched.tgz
Source1: freetds-tds_sysdep_public.h
-Patch0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/cspublic.BLK_VERSION_150.patch
-Patch1: freetds-0.82-shared-libtds.patch
+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}
%description
@@ -50,11 +54,13 @@ If you like to develop programs using %{name}, you will need to install
%prep
-%setup -q
-%patch0 -p0
+%setup -q -n %{name}-%{fullversion}
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+mv doc/doc/freetds-%{fullversion} doc/doc/freetds-%{version}
+
# correct perl path
sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl
@@ -63,7 +69,7 @@ chmod -x samples/*.sh
# Remove bogus libtool-related macros
rm -f m4/lib-*.m4
-# needed after patch0 ...
+# needed after patch0 and patch1...
autoreconf -f -i
@@ -94,6 +100,8 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h
rm -f samples/Makefile* samples/*.in samples/README
+rm -f doc/doc/freetds-%{version}/reference/installdox
+
mv -f samples/unixodbc.freetds.driver.template \
samples/unixodbc.freetds.driver.template-%{bits}
@@ -101,7 +109,7 @@ mv -f samples/unixodbc.freetds.driver.template \
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -111,7 +119,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root, -)
%{_bindir}/*
%{_libdir}/*.so.*
-%{_libdir}/libtds-%{version}.so
%config(noreplace) %{_sysconfdir}/*.conf
%doc AUTHORS BUGS COPYING* NEWS README TODO doc/*.html
%doc doc/doc/freetds-%{version}/userguide doc/images
@@ -123,7 +130,6 @@ rm -rf $RPM_BUILD_ROOT
%doc samples
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
-%exclude %{_libdir}/libtds-%{version}.so
%{_includedir}/*
@@ -133,6 +139,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Feb 10 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.1.20100810dev
+- update to the latest stable snapshot 0.82.1.dev.20100810
+- fix shared-libtds patch to provide properly library names
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list