diff --git a/xine-lib.changes b/xine-lib.changes
index 4d07a95..ac6656c 100644
--- a/xine-lib.changes
+++ b/xine-lib.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 13 10:57:56 UTC 2012 - coolo@suse.com
+
+- patch license to follow spdx.org standard
+
 -------------------------------------------------------------------
 Mon Dec 02 22:51:00 UTC 2011 - Manfred.Tremmel@iiv.de
 
diff --git a/xine-lib.spec b/xine-lib.spec
index 0d95b2d..c55e40a 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -15,8 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           xine-lib
 # %bcond_with = default off
@@ -48,13 +46,28 @@ Name:           xine-lib
 #
 %bcond_without external_ffmpeg
 #
-BuildRequires:  ImageMagick-devel alsa-devel flac-devel giflib-devel
-BuildRequires:  glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel
-BuildRequires:  libcdio-devel libdrm-devel libmng-devel libsmbclient
-BuildRequires:  Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel
-BuildRequires:  readline-devel update-desktop-files vcdimager-devel
-BuildRequires:  speex-devel
+BuildRequires:  ImageMagick-devel
+BuildRequires:  Mesa-devel
+BuildRequires:  alsa-devel
+BuildRequires:  flac-devel
+BuildRequires:  giflib-devel
+BuildRequires:  glib2-devel
+BuildRequires:  gnutls-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  imlib2-devel
+BuildRequires:  krb5-devel
+BuildRequires:  libcdio-devel
+BuildRequires:  libdrm-devel
+BuildRequires:  libmng-devel
+BuildRequires:  libsmbclient
+BuildRequires:  libsmbclient-devel
+BuildRequires:  libtheora-devel
 BuildRequires:  libtool
+BuildRequires:  libvorbis-devel
+BuildRequires:  readline-devel
+BuildRequires:  speex-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  vcdimager-devel
 %if 0%{suse_version} >= 1210
 BuildRequires:  libv4l-devel >= 0.8.4
 %else
@@ -70,7 +83,8 @@ BuildRequires:  lirc
 %if !%{with distributable}
 # those requiremens are optional but internal copies are likely old
 %if %{with external_ffmpeg}
-BuildRequires:  libfaad-devel libffmpeg-devel
+BuildRequires:  libfaad-devel
+BuildRequires:  libffmpeg-devel
 %endif
 %endif
 %if %{with pulseaudio}
@@ -113,8 +127,8 @@ Obsoletes:      xine-lib-64bit
 %endif
 %define abiversion 1.30
 Summary:        Video Player with Plug-Ins
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
-License:        GPLv2+
 Url:            http://www.xine-project.org/home
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with distributable}
@@ -160,8 +174,8 @@ verbreitete.
 
 %package -n libxine1
 Summary:        Video Player with Plug-Ins
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
-License:        GPLv2+
 Provides:       xine-lib = %{version}-%{release}
 Obsoletes:      xine-lib < %{version}-%{release}
 Provides:       xine-extra = %{version}-%{release}
@@ -255,8 +269,8 @@ Autoren:
     Guenter Bartsch <guenter@sourceforge.net>
 
 %package -n libxine-devel
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Development environment for xine-based media players
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel freetype2-devel zlib-devel libxine1 = %{version}
 Obsoletes:      libxine1-devel < %{version}-%{release}
@@ -376,8 +390,8 @@ Autoren:
 %if %{with pulseaudio}
 
 %package -n libxine1-pulse
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Pulseaudio plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 Supplements:    packageand(libpulse0:libxine1)
@@ -400,8 +414,8 @@ Autoren:
 %if %{with sdl}
 
 %package -n libxine1-sdl
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        SDL plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -424,8 +438,8 @@ Autoren:
 %if %{with arts}
 
 %package -n libxine1-arts
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Arts plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -448,8 +462,8 @@ Autoren:
 %if %{with aalib}
 
 %package -n libxine1-aa
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Aalib and libcaca plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -472,8 +486,8 @@ Autoren:
 %if %{with esd}
 
 %package -n libxine1-esd
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Esd plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -495,8 +509,8 @@ Authors:
 %if %{with jack}
 
 %package -n libxine1-jack
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Jack plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -519,8 +533,8 @@ Autoren:
 %if %{with directfb}
 
 %package -n libxine1-directfb
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Directfb plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 
@@ -543,8 +557,8 @@ Autoren:
 %if %{with gnome_vfs}
 
 %package -n libxine1-gnome-vfs
-License:        GPLv2+ ; Public Domain, Freeware
 Summary:        Gnome-vfs plugin for xine
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 Supplements:    packageand(gnome-vfs2:libxine1)
@@ -568,9 +582,9 @@ Autoren:
 %if !%{with distributable}
 
 %package -n libxine1-codecs
-License:        GPLv2+ ; Public Domain, Freeware
 # these libs are possibly illegal and may not work without libdvdcss anyway
 Summary:        Xine plugins for watching DVDs, DivX and more
+License:        GPL-2.0+ ; SUSE-Public-Domain
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libxine1 = %{version}
 Obsoletes:      xine-mad