Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
license update: MPLv1.1 or GPLv2+ or LGPLv2+
authorcfarrell@novell.com
Tue, 29 Mar 2011 18:58:19 +0200
changeset 247 71521dfedb0b
parent 245 930e17048499
child 248 0fea78eee35a
child 249 7298a2e37ba3
license update: MPLv1.1 or GPLv2+ or LGPLv2+
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
mozilla-xulrunner20/mozilla-xulrunner20.changes file | annotate | diff | comparison | revisions
mozilla-xulrunner20/mozilla-xulrunner20.spec file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Mar 28 19:22:41 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Tue Mar 29 18:58:19 2011 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Mar 28 19:22:41 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Mar 29 18:58:19 2011 +0200
@@ -33,7 +33,7 @@
 %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 @@
 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}
@@ -123,7 +123,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}
@@ -135,7 +135,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;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}
@@ -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 = 4.0
--- a/mozilla-xulrunner20/mozilla-xulrunner20.changes	Mon Mar 28 19:22:41 2011 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.changes	Tue Mar 29 18:58:19 2011 +0200
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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^
+
 -------------------------------------------------------------------
 Mon Mar 28 19:21:46 UTC 2011 - idoenmez@novell.com
 
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Mon Mar 28 19:22:41 2011 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Tue Mar 29 18:58:19 2011 +0200
@@ -29,7 +29,7 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        2.0.0
 Release:        1
 %define         releasedate 2011031700
@@ -115,7 +115,7 @@
 
 
 %package -n mozilla-js20
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Mozilla JS 1.8.5 engine
 Group:          Productivity/Other
 
@@ -127,7 +127,7 @@
 
 
 %package devel
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        XULRunner/Gecko SDK 2.0
 Group:          Development/Libraries/Other
 %if %has_system_nspr
@@ -144,7 +144,7 @@
 %if %localize
 
 %package translations-common
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Common translations for XULRunner 2.0
 Group:          System/Localization
 Requires:       %{name} = %{version}
@@ -161,7 +161,7 @@
 
 
 %package translations-other
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Extra translations for XULRunner 2.0
 Group:          System/Localization
 Requires:       %{name} = %{version}
@@ -177,7 +177,7 @@
 %endif
 
 %package gnome
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        XULRunner components depending on gnome-vfs
 Group:          Productivity/Other
 Requires:       %{name} = %{version}-%{release}
@@ -192,7 +192,7 @@
 
 %if %crashreporter
 %package buildsymbols
-License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Breakpad buildsymbols for %{name}
 Group:          Development/Debug
mozilla