diff --git a/freetds-0.91.103.tar.gz b/freetds-0.91.103.tar.gz deleted file mode 100644 index 2a60a13..0000000 --- a/freetds-0.91.103.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:895cdce6d2af65f79db5e7034d1eba5dd3b63369a0c6b5fbc890e606c699556b -size 2061912 diff --git a/freetds-0.91.112.tar.gz b/freetds-0.91.112.tar.gz new file mode 100644 index 0000000..12215e2 --- /dev/null +++ b/freetds-0.91.112.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed +size 2374916 diff --git a/freetds.changes b/freetds.changes index 611ea0c..f2eb4f9 100644 --- a/freetds.changes +++ b/freetds.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 13 13:23:53 UTC 2015 - tchvatal@suse.com + +- Version bump to 0.91.112: + * No obvious changelog +- Various spec-cleaner sorting + ------------------------------------------------------------------- Sat Dec 6 09:15:17 UTC 2014 - jengelh@inai.de diff --git a/freetds.spec b/freetds.spec index 0e8efa4..6132cd5 100644 --- a/freetds.spec +++ b/freetds.spec @@ -1,7 +1,7 @@ # # spec file for package freetds # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,21 @@ Name: freetds -Version: 0.91.103 +Version: 0.91.112 Release: 0 Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Databases/Clients -Url: http://freetds.org/ - -#Git-Web: https://gitorious.org/freetds -#Git-Clone: git://gitorious.org/freetds/freetds -Source: ftp://ftp.freetds.org/pub/freetds/stable/%name-%version.tar.gz +Url: http://www.freetds.org/ +#Git-Web: https://gitorious.org/freetds +#Git-Clone: git://gitorious.org/freetds/freetds +Source: ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: unixODBC-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} Requires: glibc-locale -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FreeTDS is a project to document and implement the TDS (Tabular Data Stream) @@ -46,9 +43,9 @@ and ODBC. Summary: A free re-implementation of the TDS (Tabular Data Stream) protocol License: LGPL-2.1+ Group: Productivity/Databases/Clients -Obsoletes: libfreetds +Obsoletes: libfreetds < %{version} Provides: %{name} = %{version} -Provides: libfreetds +Provides: libfreetds = %{version} Obsoletes: %{name} < %{version} %description config @@ -59,7 +56,7 @@ communications. This subpackage contains default configuration files and documentation for them. -%package tools +%package tools Summary: Applications for working with the TDS (Tabular Data Stream) protocol License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Databases/Clients @@ -72,13 +69,13 @@ and ODBC. This package provides application to allow users to make use of the protocol. -%package devel +%package devel Summary: Include files needed for development with FreeTDS License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libct4 = %version -Requires: libsybdb5 = %version -Requires: libtdsodbc0 = %version +Requires: libct4 = %{version} +Requires: libsybdb5 = %{version} +Requires: libtdsodbc0 = %{version} %description devel The freetds-devel package contains the files necessary for development with @@ -106,7 +103,7 @@ use the vendors' libraries. db-lib was the first API implemented by FreeTDS, and is still the best one supported. Anything that can be done in FreeTDS can be done through db-lib. -%package -n libtdsodbc0 +%package -n libtdsodbc0 Summary: FreeTDS ODBC Driver for unixODBC License: LGPL-2.1+ Group: Productivity/Databases/Clients @@ -118,7 +115,7 @@ chief advantage is that it makes FreeTDS servers look like other ODBC servers, a big help to people who know ODBC and/or write applications for several kinds of servers. -%package doc +%package doc Summary: User documentation for FreeTDS License: LGPL-2.1+ and GPL-2.0+ Group: Documentation/HTML @@ -131,35 +128,34 @@ and can be installed even if FreeTDS main package is not installed %setup -q %build -ODBCDIR=$(odbc_config --prefix || true) -if test ! -r "$ODBCDIR/include/sql.h"; then - ODBCDIR=/usr/local -fi -if test ! -r "$ODBCDIR/include/sql.h"; then - ODBCDIR=/usr -fi -autoreconf --force --install -%configure \ - --with-unixodbc="$ODBCDIR" \ - --enable-threadsafe \ - --sysconfdir=%{_sysconfdir} \ - --with-tdsver=4.2 \ - --with-docdir=%{_docdir}/freetds \ +autoreconf -fvi +%configure \ + --with-unixodbc=%{_prefix} \ + --enable-threadsafe \ + --sysconfdir=%{_sysconfdir} \ + --with-tdsver=4.2 \ --disable-static \ --with-pic -make %{?_smp_flags} RPM_OPT_FLAGS="%{optflags}" +make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}" %install %make_install -mkdir -p %{buildroot}%{_docdir}/freetds/ -mv %{buildroot}%{_datadir}/doc/freetds-*/* %{buildroot}%{_docdir}/freetds/ -rm -rf %{buildroot}%{_docdir}/freetds-* %{buildroot}/%{_datadir}/doc/freetds-* -cp AUTHORS "%buildroot/%_defaultdocdir/%name/" -%fdupes %buildroot/%_prefix +find %{buildroot} -type f -name "*.la" -delete -print + +# Fix docu location +mkdir -p %{buildroot}%{_docdir}/freetds/ +mv %{buildroot}%{_datadir}/doc/freetds-*/* %{buildroot}%{_docdir}/freetds/ +rm -rf %{buildroot}%{_docdir}/freetds-* %{buildroot}/%{_datadir}/doc/freetds-* +cp AUTHORS "%{buildroot}/%{_defaultdocdir}/%{name}/" + +%fdupes %{buildroot}/%{_prefix} %post -n libct4 -p /sbin/ldconfig + %postun -n libct4 -p /sbin/ldconfig + %post -n libsybdb5 -p /sbin/ldconfig + %postun -n libsybdb5 -p /sbin/ldconfig %post -n libtdsodbc0 @@ -192,17 +188,16 @@ odbcinst -u -d -n 'SQL Server' %files devel %defattr (-,root,root) %doc BUGS COPYING* NEWS README TODO -%exclude %{_libdir}/*.la %{_libdir}/*.so %{_includedir}/* %files -n libct4 %defattr(-,root,root) -%_libdir/libct.so.4* +%{_libdir}/libct.so.4* %files -n libsybdb5 %defattr(-,root,root) -%_libdir/libsybdb.so.5* +%{_libdir}/libsybdb.so.5* %files -n libtdsodbc0 %defattr(-,root,root) @@ -210,6 +205,6 @@ odbcinst -u -d -n 'SQL Server' %files doc %defattr (-,root,root) -%_defaultdocdir/freetds/ +%{_defaultdocdir}/freetds/ %changelog