--- a/MozillaFirefox/MozillaFirefox.spec	Tue Mar 29 09:35:30 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri Apr 15 09:20:59 2011 +0200
@@ -24,7 +24,7 @@
 Name:           MozillaFirefox
 %define xulrunner mozilla-xulrunner192
 BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip
-BuildRequires:  %{xulrunner}-devel = 1.9.2.16
+BuildRequires:  %{xulrunner}-devel = 1.9.2.17
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
@@ -33,14 +33,14 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        %mainver.16
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
+Version:        %mainver.17
 Release:        1
 Provides:       web_browser
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{version}
-%define         releasedate 2011031900
+%define         releasedate 2011041400
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -106,7 +106,7 @@
 plethora of extensions.
 
 %package devel
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Devel package for Firefox
 Group:          Development/Tools/Other
 Provides:       firefox-devel = %{version}-%{release}
@@ -120,7 +120,7 @@
 %if %localize
 %package translations-common
 Summary:        Common translations for MozillaFirefox
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Provides:       locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
 Group:          System/Localization
 Requires:       %{name} = %{version}
@@ -133,7 +133,7 @@
 
 %package translations-other
 Summary:        Extra translations for MozillaFirefox
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Provides:       locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
 Group:          System/Localization
 Requires:       %{name} = %{version}
@@ -147,7 +147,7 @@
 %endif
 
 %package branding-upstream
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Upstream branding for MozillaFirefox
 Group:          Productivity/Networking/Web/Browsers
 Provides:       %{name}-branding = 3.5