From bbb98f51935f0e48855a6accb0f9584fad284422d8d38ca621f784863655c29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 6 Feb 2012 18:20:58 +0000 Subject: [PATCH 1/2] Accepting request 102918 from home:jengelh:branches:devel:libraries:c_c++ - Remove redundant tags/sections - Resolve dependency indirection OBS-URL: https://build.opensuse.org/request/show/102918 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freetds?expand=0&rev=14 --- freetds.changes | 6 ++++++ freetds.spec | 23 ++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/freetds.changes b/freetds.changes index 88026f6..ba5def9 100644 --- a/freetds.changes +++ b/freetds.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 5 20:21:09 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections +- Resolve dependency indirection + ------------------------------------------------------------------- Wed Oct 12 10:19:44 UTC 2011 - tabraham@novell.com diff --git a/freetds.spec b/freetds.spec index f9d7b14..3982adb 100644 --- a/freetds.spec +++ b/freetds.spec @@ -1,7 +1,7 @@ # # spec file for package freetds # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: freetds Version: 0.91 -Release: 1 +Release: 0 %define dirver 0.91 %define filever 0.91 -License: LGPL Summary: A free re-implementation of the TDS (Tabular DataStream) protocol -URL: http://www.freetds.org/ +License: LGPL Group: Productivity/Databases/Clients +Url: http://www.freetds.org/ Source: %{name}-%{filever}.tar.bz2 BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: unixODBC BuildRequires: unixODBC-devel -BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -46,6 +44,7 @@ and ODBC. %package -n libfreetds Summary: A free re-implementation of the TDS (Tabular DataStream) protocol +License: LGPL Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -58,9 +57,9 @@ and ODBC. %package tools Summary: Applications for working with the TDS (Tabular DataStream) protocol -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} License: GPL, LGPL +Group: Development/Libraries/C and C++ +Requires: libfreetds = %version %description tools FreeTDS is a project to document and implement the TDS (Tabular DataStream) @@ -72,8 +71,9 @@ This package provides application to allow users to make use of the protocol %package devel Summary: Include files needed for development with FreeTDS +License: LGPL Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: libfreetds = %version %description devel The freetds-devel package contains the files necessary for development with @@ -81,6 +81,7 @@ the FreeTDS libraries. %package -n libtdsodbc0 Summary: FreeTDS ODBC Driver for unixODBC +License: LGPL Group: Productivity/Databases/Clients Requires: unixODBC >= 2.0.0 @@ -89,6 +90,7 @@ The freetds-unixodbc package contains ODBC driver build for unixODBC. %package doc Summary: User documentation for FreeTDS +License: LGPL Group: Productivity/Databases/Clients %description doc @@ -108,7 +110,6 @@ if test ! -r "$ODBCDIR/include/sql.h"; then fi autoreconf --force --install %configure \ - --prefix=/usr \ --with-unixodbc="$ODBCDIR" \ --enable-threadsafe \ --sysconfdir=%{_sysconfdir} \ From af0533f021089af7c2e4343dc6ed03e4782a84aca0ef602187f666c3eb704458 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 7 Feb 2012 08:07:45 +0000 Subject: [PATCH 2/2] - there is a GPL copying too, so add GPL-2.0+ too OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/freetds?expand=0&rev=15 --- freetds.changes | 5 +++++ freetds.spec | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/freetds.changes b/freetds.changes index ba5def9..9559089 100644 --- a/freetds.changes +++ b/freetds.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 7 08:05:54 UTC 2012 - coolo@suse.com + +- there is a GPL copying too, so add GPL-2.0+ too + ------------------------------------------------------------------- Sun Feb 5 20:21:09 UTC 2012 - jengelh@medozas.de diff --git a/freetds.spec b/freetds.spec index 3982adb..7c04e50 100644 --- a/freetds.spec +++ b/freetds.spec @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: freetds Version: 0.91 Release: 0 %define dirver 0.91 %define filever 0.91 Summary: A free re-implementation of the TDS (Tabular DataStream) protocol -License: LGPL +License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Databases/Clients Url: http://www.freetds.org/ Source: %{name}-%{filever}.tar.bz2 @@ -44,7 +45,7 @@ and ODBC. %package -n libfreetds Summary: A free re-implementation of the TDS (Tabular DataStream) protocol -License: LGPL +License: LGPL-2.1+ Group: System/Libraries Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -57,7 +58,7 @@ and ODBC. %package tools Summary: Applications for working with the TDS (Tabular DataStream) protocol -License: GPL, LGPL +License: LGPL-2.1+ and GPL-2.0+ Group: Development/Libraries/C and C++ Requires: libfreetds = %version @@ -71,7 +72,7 @@ This package provides application to allow users to make use of the protocol %package devel Summary: Include files needed for development with FreeTDS -License: LGPL +License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: libfreetds = %version @@ -81,7 +82,7 @@ the FreeTDS libraries. %package -n libtdsodbc0 Summary: FreeTDS ODBC Driver for unixODBC -License: LGPL +License: LGPL-2.1+ Group: Productivity/Databases/Clients Requires: unixODBC >= 2.0.0 @@ -90,7 +91,7 @@ The freetds-unixodbc package contains ODBC driver build for unixODBC. %package doc Summary: User documentation for FreeTDS -License: LGPL +License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Databases/Clients %description doc