diff --git a/.firefox.metadata b/.firefox.metadata index fbd04ec..46731b9 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,2 +1,2 @@ -87364e16f99b172e677e245fa0805972d8b35070 SOURCES/firefox-38.0.1esr.source.tar.bz2 -a3504ff7a15f58ec8175b7774769f78fcb0785c7 SOURCES/firefox-langpacks-38.0.1esr-20150515.tar.bz2 +207b9e5a0dcb2bacdccd9e57051421ab4cb6e57c SOURCES/firefox-38.1.0esr.source.tar.bz2 +1604d2f8472ac39865bd1e458df73820954fb5ca SOURCES/firefox-langpacks-38.1.0esr-20150625.tar.bz2 diff --git a/.gitignore b/.gitignore index b4d3ef8..c30e361 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/firefox-38.0.1esr.source.tar.bz2 -SOURCES/firefox-langpacks-38.0.1esr-20150515.tar.bz2 +SOURCES/firefox-38.1.0esr.source.tar.bz2 +SOURCES/firefox-langpacks-38.1.0esr-20150625.tar.bz2 diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index 2b5da25..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,28 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("storage.nfs_filesystem", false); -pref("dom.ipc.plugins.enabled.nswrapper*", false); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); -pref("toolkit.storage.synchronous", 0); -pref("startup.homepage_override_url", "http://www.centos.org"); -pref("startup.homepage_welcome_url", "http://www.centos.org"); -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -pref("extensions.shownSelectionUI", true); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/SOURCES/firefox-nss-3.18.0.patch b/SOURCES/firefox-nss-3.18.0.patch deleted file mode 100644 index 1a2d195..0000000 --- a/SOURCES/firefox-nss-3.18.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-release/configure.in.old mozilla-release/configure.in ---- mozilla-release/configure.in.old 2015-04-28 20:31:45.000000000 +0200 -+++ mozilla-release/configure.in 2015-04-28 20:32:40.807783614 +0200 -@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, - _USE_SYSTEM_NSS=1 ) - - if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.18.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.18.0, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) - fi - - if test -n "$MOZ_NATIVE_NSS"; then diff --git a/SOURCES/firefox-nss-3.19.1.patch b/SOURCES/firefox-nss-3.19.1.patch new file mode 100644 index 0000000..53c8426 --- /dev/null +++ b/SOURCES/firefox-nss-3.19.1.patch @@ -0,0 +1,12 @@ +diff -up mozilla-esr38/configure.in.nss-3.19.0 mozilla-esr38/configure.in +--- mozilla-esr38/configure.in.nss-3.19.0 2015-06-25 10:36:40.205019840 +0200 ++++ mozilla-esr38/configure.in 2015-06-25 11:58:46.859155245 +0200 +@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_NATIVE_NSS"; then diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..01a917c --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,28 @@ +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +pref("browser.backspace_action", 2); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.shell.checkDefaultBrowser", false); +pref("general.smoothScroll", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("storage.nfs_filesystem", false); +pref("dom.ipc.plugins.enabled.nswrapper*", false); +pref("network.manage-offline-status", true); +pref("toolkit.networkmanager.disable", false); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); +pref("toolkit.storage.synchronous", 0); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +pref("extensions.shownSelectionUI", true); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 0255b2f..35326d0 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -53,7 +53,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 38.0.1 +Version: 38.1.0 Release: 1%{?prever}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -61,11 +61,11 @@ Group: Applications/Internet # From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source Source0: firefox-%{version}%{?prever}%{?ext_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20150515.tar.bz2 +Source1: firefox-langpacks-%{version}%{?ext_version}-20150625.tar.bz2 %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -79,7 +79,7 @@ Patch6: webrtc-arch-cpu.patch Patch7: build-no-format.patch Patch8: firefox-ppc64le.patch Patch9: firefox-debug.patch -Patch10: firefox-nss-3.18.0.patch +Patch10: firefox-nss-3.19.1.patch Patch11: build-nspr-prbool.patch # RPM specific patches @@ -199,7 +199,7 @@ cd %{tarballdir} %if %{?debug_build} %patch9 -p1 -b .debug %endif -%patch10 -p1 -b .nss-3.18.0 +%patch10 -p1 -b .nss-3.19.1 %patch11 -p1 -b .nspr-prbool # RPM specific patches @@ -467,15 +467,6 @@ if [ $1 -eq 0 ] ; then fi update-desktop-database &> /dev/null || : -%preun -# is it a final removal? -if [ $1 -eq 0 ]; then - %{__rm} -rf %{mozappdir}/components - %{__rm} -rf %{mozappdir}/extensions - %{__rm} -rf %{mozappdir}/langpacks - %{__rm} -rf %{mozappdir}/plugins -fi - %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -540,10 +531,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Jun 23 2015 CentOS Sources - 38.0.1-1.el7.centos -- CentOS default prefs +* Thu Jun 25 2015 Jan Horak - 38.1.0-1 +- Update to 38.1.0 ESR + +* Thu May 21 2015 Jan Horak - 38.0.1-2 +- Fixed rhbz#1222807 by removing preun section -* Fri May 15 2015 Martin Stransky - 38.0-5 +* Fri May 15 2015 Martin Stransky - 38.0.1-1 - Update to 38.0.1 ESR * Thu May 14 2015 Martin Stransky - 38.0-4