Accepting request 156499 from openSUSE:Factory:Staging:spdx

update license to new format

OBS-URL: https://build.opensuse.org/request/show/156499
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=12

x11-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 27 06:18:01 UTC 2013 - coolo@suse.com
+
+- update license to new format
+
 -------------------------------------------------------------------
 Mon Oct 10 04:42:10 UTC 2011 - sndirsch@suse.com
 

x11-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package x11-tools
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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,19 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           x11-tools
-License:        GPLv2+ ; MIT License (or similar)
-Group:          System/X11/Utilities
 PreReq:         %fillup_prereq
-Provides:       xf86tools 3ddiag
-Obsoletes:      xf86tools 3ddiag
-AutoReqProv:    on
+Provides:       3ddiag
+Provides:       xf86tools
+Obsoletes:      3ddiag
+Obsoletes:      xf86tools
 Version:        0.1
-Release:        183
+Release:        0
 Summary:        Tools for the X Window System
+License:        GPL-2.0+ and MIT
+Group:          System/X11/Utilities
 Source2:        xf86debug
 Source6:        wmlist
 Source8:        kroot