From a60359ac0e8796b19f600cef368a0887f34aac6b6eafae71fcaf344d5e86df7a Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 25 Jan 2013 09:30:44 +0000
Subject: [PATCH] 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