From c3e47bf8037c95ca03f778b92b2b33b3986115d35a05343079363657e72f050b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 15 Dec 2011 10:30:05 +0000 Subject: [PATCH 1/3] Accepting request 96722 from devel:openSUSE:Factory:for-legal-lhf - fix license to be in spdx.org format OBS-URL: https://build.opensuse.org/request/show/96722 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adolc?expand=0&rev=28 --- adolc.changes | 5 +++++ adolc.spec | 20 ++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/adolc.changes b/adolc.changes index ec47319..26278ab 100644 --- a/adolc.changes +++ b/adolc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 15 10:28:47 UTC 2011 - coolo@suse.com + +- fix license to be in spdx.org format + ------------------------------------------------------------------- Thu Oct 6 10:59:00 UTC 2011 - kkhere.geo@gmail.com diff --git a/adolc.spec b/adolc.spec index 9c6fab3..8ff0818 100644 --- a/adolc.spec +++ b/adolc.spec @@ -15,23 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define packver 2.2.1 Name: adolc %define lname libadolc1 Version: 2.2.1 -Release: 1 -License: GPLv2 or CPL +Release: 0 Summary: Algorithmic Differentiation Library for C/C++ -Url: http://projects.coin-or.org/ADOL-C +License: GPL-2.0 or CPL-1.0 Group: Development/Languages/C and C++ +Url: http://projects.coin-or.org/ADOL-C Source: %{name}-%{packver}.tar.bz2 Source1: ColPack-1.0.4.tar.bz2 Source2: baselibs.conf Patch1: correct-no-return-in-non-void.patch -BuildRequires: autoconf automake libtool -BuildRequires: gcc-c++ libstdc++-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libstdc++-devel +BuildRequires: libtool # BuildRequires: texlive texlive-latex BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,9 +49,7 @@ truncation errors at a small multiple of the run time and randomly accessed memory of the given function evaluation program. %package -n %lname -License: GPLv2 or CPL Summary: Algorithmic Differentiation Library for C/C++ -Group: Development/Languages/C and C++ %description -n %lname The package ADOL-C (Automatic Differentiation by OverLoading in C++) @@ -63,9 +63,7 @@ truncation errors at a small multiple of the run time and randomly accessed memory of the given function evaluation program. %package devel -License: GPLv2 or CPL Summary: Algorithmic Differentiation Library for C/C++ -- development files -Group: Development/Languages/C and C++ Requires: %lname = %{version} %description devel @@ -82,9 +80,7 @@ accessed memory of the given function evaluation program. This package provides the development environment for adolc %package doc -License: GPLv2 or CPL Summary: Algorithmic Differentiation Library for C/C++ -- documentation -Group: Development/Languages/C and C++ %if 0%{?suse_version} && %{suse_version} >= 1120 BuildArch: noarch %endif From 03c120fca2f53c5cbd9e3d60447e68b1652102c83ba10efdffd170d4b9f3f49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 19 Dec 2011 12:28:42 +0000 Subject: [PATCH 2/3] Accepting request 97029 from home:repabuild applied correct group tags this time: Development/Libraries/C and C++ for main package and devel, System/Libraries for the lib package Documentation/Other for the doc package OBS-URL: https://build.opensuse.org/request/show/97029 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adolc?expand=0&rev=29 --- adolc.changes | 14 ++++++++++++++ adolc.spec | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/adolc.changes b/adolc.changes index 26278ab..39eb3b6 100644 --- a/adolc.changes +++ b/adolc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Dec 19 11:13:36 UTC 2011 - Rene.vanPaassen@gmail.com + +- Corrected group tags to proper categories + +------------------------------------------------------------------- +Fri Dec 16 16:19:31 UTC 2011 - Rene.vanPaassen@gmail.com + +- need Group: tags for SLE_11 and SLE_11_SP1, if all tags are equal, + the format_spec_file service is so NICE (not!) to remove subpackage + group tags. the doc package needs a Group: Documentation tag + (guidelines), and then, fortunately, format_spec_file leaves + us alone + ------------------------------------------------------------------- Thu Dec 15 10:28:47 UTC 2011 - coolo@suse.com diff --git a/adolc.spec b/adolc.spec index 8ff0818..d5bdcd8 100644 --- a/adolc.spec +++ b/adolc.spec @@ -23,7 +23,7 @@ Version: 2.2.1 Release: 0 Summary: Algorithmic Differentiation Library for C/C++ License: GPL-2.0 or CPL-1.0 -Group: Development/Languages/C and C++ +Group: Development/Libraries/C and C++ Url: http://projects.coin-or.org/ADOL-C Source: %{name}-%{packver}.tar.bz2 Source1: ColPack-1.0.4.tar.bz2 @@ -50,6 +50,7 @@ accessed memory of the given function evaluation program. %package -n %lname Summary: Algorithmic Differentiation Library for C/C++ +Group: System/Libraries %description -n %lname The package ADOL-C (Automatic Differentiation by OverLoading in C++) @@ -64,6 +65,7 @@ accessed memory of the given function evaluation program. %package devel Summary: Algorithmic Differentiation Library for C/C++ -- development files +Group: Development/Libraries/C and C++ Requires: %lname = %{version} %description devel @@ -81,6 +83,7 @@ This package provides the development environment for adolc %package doc Summary: Algorithmic Differentiation Library for C/C++ -- documentation +Group: Documentation/Other %if 0%{?suse_version} && %{suse_version} >= 1120 BuildArch: noarch %endif From a622a678e4cea804b94631472404cf37d6aca17c694ec9485366c5094d772756 Mon Sep 17 00:00:00 2001 From: Kshitij Kulshreshtha Date: Fri, 17 Feb 2012 06:45:33 +0000 Subject: [PATCH 3/3] - Change License tag to reflect discussion in bnc#739158 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/adolc?expand=0&rev=30 --- adolc.changes | 5 +++++ adolc.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/adolc.changes b/adolc.changes index 39eb3b6..7840ec8 100644 --- a/adolc.changes +++ b/adolc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 17 06:44:42 UTC 2012 - kkhere.geo@gmail.com + +- Change License tag to reflect discussion in bnc#739158 + ------------------------------------------------------------------- Mon Dec 19 11:13:36 UTC 2011 - Rene.vanPaassen@gmail.com diff --git a/adolc.spec b/adolc.spec index d5bdcd8..36eee15 100644 --- a/adolc.spec +++ b/adolc.spec @@ -1,7 +1,7 @@ # # spec file for package adolc # -# 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define packver 2.2.1 Name: adolc @@ -22,8 +23,9 @@ Name: adolc Version: 2.2.1 Release: 0 Summary: Algorithmic Differentiation Library for C/C++ -License: GPL-2.0 or CPL-1.0 +License: (GPL-2.0 or CPL-1.0) and LGPL-3.0 Group: Development/Libraries/C and C++ +# see bnc#739158 for a discussion on the licensing issue Url: http://projects.coin-or.org/ADOL-C Source: %{name}-%{packver}.tar.bz2 Source1: ColPack-1.0.4.tar.bz2