Accepting request 97028 from Base:System

Clarify license (forwarded request 97026 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/97028
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-prober?expand=0&rev=5

COPYING-note.txt

@@ -0,0 +1,19 @@
+Version 1.50 of os-prober contains a license clarification, the
+license of the package is GPL-2+, see for example the following commits:
+
+http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commitdiff;h=249d0814ae9c6e308baaaad4ec4e0a403a592ffd
+http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=25024daeccd86cec17353455b99af677b3b83b16
+http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=cc0ce8e5ec252b10127ca3ebb71c12cd31d4ebc4
+
+The copyright file reads as of 2011-12-19:
+
+The majority of code in os-prober is Copyright 2004-2011 by Joshua
+Kwan, Joey Hess, Christian Perrier, Colin Watson and Otavio Salvador.
+This is licensed under the terms of the GNU GPL, either version 2 or,
+at your option, any later version.
+
+Some portions of os-prober by other contributors has an unclear license
+of "GNU GPL", with the version not specified.
+
+On Debian systems, a copy of the GNU General Public License is available in
+/usr/share/common-licenses/GPL.

os-prober.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Dec 19 11:13:44 UTC 2011 - aj@suse.de
+
+- Clarify license.
+
+-------------------------------------------------------------------
+Thu Dec  8 12:23:12 UTC 2011 - aj@suse.de
+
+- Update to 1.49:
+  * MeeGo detection support
+  * Bugfixes
+
+-------------------------------------------------------------------
+Thu Dec  8 11:18:49 UTC 2011 - coolo@suse.com
+
+- this seems to be "GPL" as it was understood 2004, so guessing
+  GPL-2.0+
+
 -------------------------------------------------------------------
 Fri Sep 30 15:53:26 UTC 2011 - uli@suse.com
 

os-prober.spec

@@ -18,14 +18,15 @@
 
 
 Name:           os-prober
-Version:        1.47
-Release:        1
+Version:        1.49
+Release:        0
 Summary:        Probes disks on the system for installed operating systems
-
-License:        GPL
-Url:            http://kitenet.net/~joey/code/os-prober/
+License:        GPL-2.0+
 Group:          System/Boot
+
+Url:            http://kitenet.net/~joey/code/os-prober/
 Source0:        http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz
+Source1:        COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
 Patch0:         os-prober-newnsdirfix.patch
@@ -48,6 +49,7 @@ distributions can be added easily.
 
 %prep
 %setup -q -n %{name}
+cp %SOURCE1 .
 %patch0 -p1
 %patch1 -p1
 
@@ -90,7 +92,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO debian/copyright debian/changelog
+%doc README TODO debian/copyright debian/changelog COPYING-note.txt
 %{_bindir}/*
 %{_libexecdir}/linux-boot-probes
 %{_libexecdir}/newns

os-prober_1.47.tar.gz

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

os-prober_1.49.tar.gz

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