From 370a5fee1042777d16f621248753a10bbc3449de4f57ed1ca6f6b0f7dda57daf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 Dec 2011 09:05:55 +0000 Subject: [PATCH 1/2] Accepting request 94960 from home:babelworx:ldig:branches:Base:System license update: GPL-3.0+ Consolidate to GPL-3.0+ and use SPDX format (http://www.spdx.org/licenses). More or less compatible to Fedora package (who don^t use full SPDX implementation) OBS-URL: https://build.opensuse.org/request/show/94960 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=138 --- coreutils.changes | 8 ++++++++ coreutils.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/coreutils.changes b/coreutils.changes index 880d8da..084d992 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 2 08:09:09 UTC 2011 - cfarrell@suse.com + +- license update: GPL-3.0+ + Consolidate to GPL-3.0+ and use SPDX format + (http://www.spdx.org/licenses). More or less compatible to Fedora package + (who don^t use full SPDX implementation) + ------------------------------------------------------------------- Wed Nov 30 09:45:46 UTC 2011 - coolo@suse.com diff --git a/coreutils.spec b/coreutils.spec index 25f9b0d..40af4ec 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -21,7 +21,7 @@ Name: coreutils Summary: GNU Core Utilities BuildRequires: automake help2man libacl-devel libcap-devel libselinux-devel pam-devel xz Url: http://www.gnu.org/software/coreutils/ -License: GFDL-1.1; GPL-2+; GPL-3+ +License: GPL-3.0+ Group: System/Base Version: 8.14 Release: 0 From 9e73a5cefb8d5795a28f6d39174f3c24df29f811a1c621f2d0cef108428aed41 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 19 Dec 2011 16:13:16 +0000 Subject: [PATCH 2/2] - Adjust license for coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff [bnc#735081]. OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=139 --- ...or-settings-in-etc-default-su-resp-etc-login.defs.diff | 8 ++++---- coreutils.changes | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff b/coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff index 9770bc8..bff7d2b 100644 --- a/coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff +++ b/coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff @@ -34,8 +34,8 @@ index 0000000..e1872cf + Author: Thorsten Kukuk + + This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 as -+ published by the Free Software Foundation. ++ it under the terms of the GNU General Public License version 2 or ++ later as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -299,8 +299,8 @@ index 0000000..2e86cf9 + Author: Thorsten Kukuk + + This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License version 2 as -+ published by the Free Software Foundation. ++ it under the terms of the GNU General Public License version 2 or ++ later published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/coreutils.changes b/coreutils.changes index 084d992..5e2bfd0 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 19 15:09:12 UTC 2011 - lnussel@suse.de + +- Adjust license for coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff + [bnc#735081]. + ------------------------------------------------------------------- Fri Dec 2 08:09:09 UTC 2011 - cfarrell@suse.com