Update to 0.95.81

freetds-0.91-printf.patch

@@ -1,12 +0,0 @@
-diff -rbu freetds-freetds/src/apps/bsqldb.c freetds-freetds-OK/src/apps/bsqldb.c
---- freetds-freetds/src/apps/bsqldb.c	2013-08-22 00:19:20.000000000 +0400
-+++ freetds-freetds-OK/src/apps/bsqldb.c	2013-12-03 19:32:39.916501589 +0400
-@@ -545,7 +545,7 @@
- 							perror("could not write to output file");
- 							exit(EXIT_FAILURE);
- 						}
--						fprintf(stdout, metadata[c].format_string); /* col/row separator */
-+						fprintf(stdout, "%s", metadata[c].format_string); /* col/row separator */
- 						continue;
- 					}
- 					switch (data[c].status) { /* handle nulls */

freetds.spec

@@ -1,15 +1,9 @@
-%define git_commit	0a42888
-
-%ifarch alpha ia64 x86_64 ppc64 ppc64le sparc64 s390x aarch64
-%define bits	64
-%else
-%define bits	32
-%endif
+%define bits	%{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32}
 
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
-Version: 0.91
-Release: 16.git%{git_commit}%{?dist}
+Version: 0.95.81
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
@@ -18,11 +12,10 @@ URL: http://www.freetds.org/
 #   http://gitorious.org/freetds/freetds/archive-tarball/Branch-0_91
 #  then
 #   mv freetds-freetds-Branch-0_91.tar.gz freetds-%{version}-%{git_commit}.tar.gz
-Source0: freetds-%{version}-%{git_commit}.tar.gz
+#Source0: freetds-%{version}-%{git_commit}.tar.gz
 
-#Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2
+Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2
 Source1: freetds-tds_sysdep_public.h
-Patch1: freetds-0.91-printf.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, krb5-devel
@@ -61,29 +54,22 @@ If you like to develop programs using %{name}, you will need to install
 
 
 %prep 
-%setup -q -n freetds-freetds
-#%setup -q
-%patch1 -p1
+%setup -q
 
 #  correct perl path
 sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl
 
-chmod -x samples/*.sh samples/*.pl
-
-find . -name .cvsignore -print | xargs rm -f
-find . -name .gitignore -print | xargs rm -f
+chmod -x samples/*.sh
 
 
 %build 
 
-export LIBS=-lgcrypt
-
 [ -f configure ] || NOCONFIGURE=yes ./autogen.sh
 
 %configure \
 	--disable-dependency-tracking \
 	--disable-rpath \
-	%{!?_with_static: --disable-static} \
+	--disable-static \
 	--with-tdsver="4.2" \
 	--with-unixodbc="%{_prefix}" \
 	--enable-msdblib \
@@ -91,15 +77,21 @@ export LIBS=-lgcrypt
 	--with-gnutls \
 	--enable-krb5
 
+#  disable-rpath in configure does not work...
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_RIE|' libtool
+
+
 make %{?_smp_mflags} DOCBOOK_DSL="`rpm -ql docbook-style-dsssl | fgrep html/docbook.dsl`"
 
  
 %install 
 rm -rf $RPM_BUILD_ROOT
 
-make install DOCDIR=doc/%{name} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/*
 
 mv -f $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h \
 	$RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public_%{bits}.h
@@ -107,11 +99,13 @@ 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}
 
+#  deinstall it for our own way...
+mv -f $RPM_BUILD_ROOT%{_docdir}/%{name} docdir
+find docdir -type f -print0 | xargs -0 chmod -x
+
 
 %post -p /sbin/ldconfig
 
@@ -128,24 +122,33 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/*.conf
 %doc AUTHORS BUGS COPYING* NEWS README TODO doc/*.html
-%doc doc/doc/freetds-%{version}/userguide doc/images
+%doc docdir/userguide docdir/images
 %{_mandir}/*/*
 
  
 %files devel 
 %defattr (-, root, root, -) 
 %doc samples
-%{?_with_static: %{_libdir}/*.a}
 %{_libdir}/*.so
 %{_includedir}/*
 
 
 %files doc
 %defattr (-, root, root, -) 
-%doc doc/doc/freetds-%{version}/reference
+%doc docdir/reference
  
 
 %changelog
+* Wed Feb 10 2016 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.95.81-1
+- update to 0.95.81
+- use proper rpm macros to determine 64 bit arches
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.95.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Sep 10 2015 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.95.19-1
+- Upgrade to 0.95.19
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.91-16.git0a42888
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-e216be46db3e44a500a438d5057c3ba8  freetds-0.91-0a42888.tar.gz
+b90fd87f48c4f04d3bca859d164d3aab  freetds-0.95.81.tar.bz2