diff options
| author | Martin Stransky <stransky@anakreon.cz> | 2014-12-08 14:14:03 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@anakreon.cz> | 2014-12-08 14:14:03 +0100 |
| commit | 45f8b1bb569246b03d41a55b1b8e1ee49ddf0003 (patch) | |
| tree | 175638b24d9da3c2dc2ad4baa8fb7294b53416bd | |
| parent | Gtk3 flash plugin fix (rhbz#1171457), Gtk3 theme fixes (diff) | |
| download | librewolf-fedora-ff-45f8b1bb569246b03d41a55b1b8e1ee49ddf0003.tar.gz librewolf-fedora-ff-45f8b1bb569246b03d41a55b1b8e1ee49ddf0003.tar.bz2 librewolf-fedora-ff-45f8b1bb569246b03d41a55b1b8e1ee49ddf0003.zip | |
fixed url for java plugin installation guide, resolves rhbz#979985
| -rw-r--r-- | firefox.spec | 9 | ||||
| -rw-r--r-- | java-plugin-url.patch | 25 |
2 files changed, 33 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec index b3f0372..37371b0 100644 --- a/firefox.spec +++ b/firefox.spec @@ -113,7 +113,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 34.0 -Release: 3%{?pre_tag}%{?dist} +Release: 4%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -145,6 +145,7 @@ Patch20: firefox-build-prbool.patch Patch204: rhbz-966424.patch Patch215: firefox-enable-addons.patch Patch217: firefox-baseline-disable.patch +Patch218: java-plugin-url.patch # Upstream patches Patch300: mozilla-858919.patch @@ -291,6 +292,7 @@ cd %{tarballdir} # For branding specific patches. # Fedora patches +%patch218 -p1 -b .icedtea %patch204 -p2 -b .966424 %patch215 -p1 -b .addons # disable baseline JIT on i686 (rhbz#1047079) @@ -771,6 +773,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %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 - Gtk3 flash plugin fix (rhbz#1171457) - Gtk3 theme fixes diff --git a/java-plugin-url.patch b/java-plugin-url.patch new file mode 100644 index 0000000..4db0d5f --- /dev/null +++ b/java-plugin-url.patch @@ -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"); + |