rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed url for java plugin installation guide, resolves rhbz#979985

Browse Source
This commit is contained in:
Martin Stransky 2014-12-08 14:14:03 +01:00
parent a7cca11adb
commit 45f8b1bb56
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firefox.spec
View File

@ -113,7 +113,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 34.0 Version: 34.0
Release: 3%{?pre_tag}%{?dist} Release: 4%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -145,6 +145,7 @@ Patch20: firefox-build-prbool.patch
Patch204: rhbz-966424.patch Patch204: rhbz-966424.patch
Patch215: firefox-enable-addons.patch Patch215: firefox-enable-addons.patch
Patch217: firefox-baseline-disable.patch Patch217: firefox-baseline-disable.patch
Patch218: java-plugin-url.patch
# Upstream patches # Upstream patches
Patch300: mozilla-858919.patch Patch300: mozilla-858919.patch
@ -291,6 +292,7 @@ cd %{tarballdir}
# For branding specific patches. # For branding specific patches.
# Fedora patches # Fedora patches
%patch218 -p1 -b .icedtea
%patch204 -p2 -b .966424 %patch204 -p2 -b .966424
%patch215 -p1 -b .addons %patch215 -p1 -b .addons
# disable baseline JIT on i686 (rhbz#1047079) # disable baseline JIT on i686 (rhbz#1047079)
@ -771,6 +773,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Dec 8 2014 Jiri Vanek <jvanek@redhat.com> - 34.0-4
- added and applied patch218, java-plugin-url.patch
- fixed url for java plugin installation guide
- resolves rhbz#979985
* Mon Dec 8 2014 Martin Stransky <stransky@redhat.com> - 34.0-3 * Mon Dec 8 2014 Martin Stransky <stransky@redhat.com> - 34.0-3
- Gtk3 flash plugin fix (rhbz#1171457) - Gtk3 flash plugin fix (rhbz#1171457)
- Gtk3 theme fixes - Gtk3 theme fixes

25
java-plugin-url.patch Normal file
View File

@ -0,0 +1,25 @@
--- mozilla-release/toolkit/mozapps/plugins/content/pluginInstallerWizard.js
+++ mozilla-release/toolkit/mozapps/plugins/content/pluginInstallerWizard.js
@@ -315,6 +315,11 @@
xpiPlugins);
else
this.advancePage(null);
+}
+
+
+function endsWith(str, suffix) {
+ return str.indexOf(suffix, str.length - suffix.length) !== -1;
}
/*
@@ -405,6 +410,9 @@
// manual install
if (aManualUrl) {
+ if (endsWith(aManualUrl, "use-java-plugin-to-view-interactive-content")) {
+ aManualUrl="http://icedtea.classpath.org/wiki/IcedTea-Web_On_Fedora_And_Rhel"
+ }
var myButton = document.createElement("button");
var manualInstallLabel = this.getString("pluginInstallationSummary.manualInstall.label");