diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index f0f5697..0adcdfd 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 29 11:55:53 UTC 2011 - cfarrell@novell.com + +- license update: MPLv1.1 or GPLv2+ or LGPLv2+ + Sync licenses with Fedora. MPL does not state ^or later^ + ------------------------------------------------------------------- Fri Mar 18 08:49:15 UTC 2011 - wr@rosenauer.org -- update to version 4.0 (rc2) +- update to version 4.0rc2 - fixed rpm macros delivered with devel package (bnc#679950) ------------------------------------------------------------------- diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8372b30..26f837c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -33,7 +33,7 @@ BuildRequires: wireless-tools %if 0%{?use_xulrunner} BuildRequires: %{xulrunner}-devel = 2.0.0 %endif -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver}.0 Release: 1 Provides: web_browser @@ -109,7 +109,7 @@ compliance and performance. Its functionality can be enhanced via a 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} @@ -124,7 +124,7 @@ Development files for Firefox to make packaging of addons easier. %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} @@ -136,7 +136,7 @@ of MozillaFirefox. %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;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Group: System/Localization Requires: %{name} = %{version} @@ -148,7 +148,7 @@ of MozillaFirefox. %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 = 4.0