From 28b7b88f34f048eade66771a8fca9073a35ee9764a11e5487a8780c6a621aedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 08:02:08 +0000 Subject: [PATCH 1/4] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=108 --- licenses_changes.txt | 1 - obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index a366bac..6d79919 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -414,7 +414,6 @@ MIT MIT License (or similar) MIT MIT/X11 MIT MIT/X Consortium License MIT MIT/X License -MIT X11 MIT X11 (BSD like) MIT X11 MIT MIT X11/MIT diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index ebb149e..766a5a6 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.com + +- drop double definition of X11 license + ------------------------------------------------------------------- Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com From 3fa18c19e901222125ad8e67f184e13c0d8c2ac6deec914d2f61627c47f8fb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 08:09:23 +0000 Subject: [PATCH 2/4] simple self check OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=109 --- obs-service-format_spec_file.changes | 3 ++- obs-service-format_spec_file.spec | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 766a5a6..927edff 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.com +Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.de - drop double definition of X11 license +- add basic self check on building package ------------------------------------------------------------------- Thu Jan 24 06:11:18 UTC 2013 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 23aae5c..3977ebb 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -57,6 +57,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/obs/service install -m 0755 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +%check +perl %{SOURCE2} %_topdir/SOURCES/%name.spec + %files %defattr(-,root,root) %doc COPYING From 53f7965e2e406298caecf2a2c4dfc37abbee5585ce0f4e0773b8ae21d3e86625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 25 Jan 2013 09:01:57 +0000 Subject: [PATCH 3/4] use new source validator package name OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=110 --- obs-service-format_spec_file.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 3977ebb..dbb66aa 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -30,7 +30,7 @@ Source3: patch_license Source4: licenses_changes.txt Source5: fetch-licenses.sh Source100: COPYING -Requires: osc-source_validator +Requires: obs-service-source_validator BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From a60359ac0e8796b19f600cef368a0887f34aac6b6eafae71fcaf344d5e86df7a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 25 Jan 2013 09:30:44 +0000 Subject: [PATCH 4/4] map X11 differently OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=111 --- licenses_changes.txt | 15 ++++++++------- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index 6d79919..3fb2c91 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -411,12 +411,6 @@ MIT MIT-Licence MIT MIT license MIT MIT License MIT MIT License (or similar) -MIT MIT/X11 -MIT MIT/X Consortium License -MIT MIT/X License -MIT X11 (BSD like) -MIT X11 MIT -MIT X11/MIT Motosoto+ Motosoto+ Motosoto Motosoto MPL-1.0+ MPL-1.0+ @@ -656,10 +650,10 @@ SUSE-Vim SUSE-Vim SUSE-WTFPL-2.0 http://sam.zoy.org/wtfpl/ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) -SUSE-XFree86-1.0 The old version of the XFree86 license is not upstream at SPDX.org SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-xinetd Xinedt license (Fedora also uses a custom license here) SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) +SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) VSL-1.0+ VSL-1.0+ VSL-1.0 VSL-1.0 W3C+ W3C+ @@ -671,8 +665,15 @@ WTFPL+ WTFPL+ WTFPL WTFPL WXwindows+ WXwindows+ WXwindows WXwindows +X11 MIT/X11 +X11 MIT/X Consortium License +X11 MIT/X License +X11 SUSE-XFree86-1.0 X11+ X11+ X11 X11 +X11 X11 (BSD like) +X11 X11 MIT +X11 X11/MIT XFree86-1.1+ XFree86-1.1+ XFree86-1.1 XFree86-1.1 Xnet+ Xnet+ diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 927edff..c7ec216 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 25 09:30:32 UTC 2013 - coolo@suse.com + +- official fix for the X11 license + ------------------------------------------------------------------- Fri Jan 25 08:03:19 UTC 2013 - adrian@suse.de