Accepting request 290645 from devel:libraries:c_c++

- Version bump to 0.91.112:
  * No obvious changelog
- Various spec-cleaner sorting

OBS-URL: https://build.opensuse.org/request/show/290645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetds?expand=0&rev=13

freetds-0.91.103.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:895cdce6d2af65f79db5e7034d1eba5dd3b63369a0c6b5fbc890e606c699556b
-size 2061912

freetds-0.91.112.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be4f04ee57328c32e7e7cd7e2e1483e535071cec6101e46b9dd15b857c5078ed
+size 2374916

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
 

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/
+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
+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
@@ -76,9 +73,9 @@ This package provides application to allow users to make use of the protocol.
 Summary:        Include files needed for development with FreeTDS
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Requires:       libct4 = %version
+Requires:       libct4 = %{version}
-Requires:       libsybdb5 = %version
+Requires:       libsybdb5 = %{version}
-Requires:       libtdsodbc0 = %version
+Requires:       libtdsodbc0 = %{version}
 
 %description devel
 The freetds-devel package contains the files necessary for development with
@@ -131,35 +128,34 @@ and can be installed even if FreeTDS main package is not installed
 %setup -q
 
 %build
-ODBCDIR=$(odbc_config --prefix || true)
+autoreconf -fvi
-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"			\
+    --with-unixodbc=%{_prefix} \
     --enable-threadsafe \
     --sysconfdir=%{_sysconfdir} \
     --with-tdsver=4.2 \
-	--with-docdir=%{_docdir}/freetds \
     --disable-static \
     --with-pic
-make %{?_smp_flags} RPM_OPT_FLAGS="%{optflags}"
+make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
 
 %install
 %make_install
+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/"
+cp AUTHORS "%{buildroot}/%{_defaultdocdir}/%{name}/"
-%fdupes %buildroot/%_prefix
+
+%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