Bug 792028 - Update version_win.pl files and RPM spec file to refer to MPL 2. r=khuey.

This commit is contained in:
Gervase Markham 2012-09-20 10:19:39 +01:00
parent 6c7b3d095c
commit 2a518f5ea2
3 changed files with 3 additions and 3 deletions

View File

@ -234,7 +234,7 @@ for ($j = 1; $j < 4; $j++)
}
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;

View File

@ -234,7 +234,7 @@ for ($j = 1; $j < 4; $j++)
}
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;

View File

@ -12,7 +12,7 @@ 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