Bug 792028 - Update version_win.pl files and RPM spec file to refer to MPL 2. r=khuey.
authorGervase Markham <gerv@gerv.net>
Thu, 20 Sep 2012 10:19:39 +0100
changeset 107727 174e8b89a5ab1619c94f60224ed5751dfa135410
parent 107726 61d680a20cea0c0a41b9041a6741c53f77cfd1c6
child 107728 b3e66a4b7c0bb20aacf37878f2e1c7977e9f29da
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewerskhuey
bugs792028
milestone18.0a1
Bug 792028 - Update version_win.pl files and RPM spec file to refer to MPL 2. r=khuey.
config/version_win.pl
js/src/config/version_win.pl
toolkit/mozapps/installer/linux/rpm/mozilla.spec
--- a/config/version_win.pl
+++ b/config/version_win.pl
@@ -229,17 +229,17 @@ for ($j = 1; $j < 4; $j++)
         $appver[$j] = "0";
     }
     else {
         $appver[$j] =~s/\D.*$//;
     }
 }
 my $winappversion = "$appver[0],$appver[1],$appver[2],$appver[3]";
 
-my $copyright = "License: MPL 1.1/GPL 2.0/LGPL 2.1";
+my $copyright = "License: MPL 2";
 my $company = "Mozilla Foundation";
 my $trademarks = "Mozilla";
 my $productname = $displayname;
 
 
 if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}
 if (defined($override_description)){$override_description =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $description=$override_description;}
 if (defined($override_fileversion)){$override_fileversion =~ s/\@MOZ_APP_WINVERSION\@/$winappversion/g; $fileversion=$override_fileversion;}
--- a/js/src/config/version_win.pl
+++ b/js/src/config/version_win.pl
@@ -229,17 +229,17 @@ for ($j = 1; $j < 4; $j++)
         $appver[$j] = "0";
     }
     else {
         $appver[$j] =~s/\D.*$//;
     }
 }
 my $winappversion = "$appver[0],$appver[1],$appver[2],$appver[3]";
 
-my $copyright = "License: MPL 1.1/GPL 2.0/LGPL 2.1";
+my $copyright = "License: MPL 2";
 my $company = "Mozilla Foundation";
 my $trademarks = "Mozilla";
 my $productname = $displayname;
 
 
 if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}
 if (defined($override_description)){$override_description =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $description=$override_description;}
 if (defined($override_fileversion)){$override_fileversion =~ s/\@MOZ_APP_WINVERSION\@/$winappversion/g; $fileversion=$override_fileversion;}
--- a/toolkit/mozapps/installer/linux/rpm/mozilla.spec
+++ b/toolkit/mozapps/installer/linux/rpm/mozilla.spec
@@ -7,17 +7,17 @@
 #Use a consistent string to refer to the package by
 %define pr_name "%{moz_app_displayname} %{moz_app_version}"
 
 Name:           %{moz_app_name}
 Version:        %{moz_numeric_app_version}
 Release:        %{?moz_rpm_release:%{moz_rpm_release}}%{?buildid:.%{buildid}}
 Summary:        %{pr_name}
 Group:          Applications/Internet
-License:        MPLv1.1 or GPLv2+ or LGPLv2+
+License:        MPL 2
 Vendor:         Mozilla
 URL:            http://www.mozilla.org/projects/firefox/
 Source0:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #AutoProv:       no
 
 BuildRequires:  desktop-file-utils