diff options
Diffstat (limited to 'firefox.spec')
| -rw-r--r-- | firefox.spec | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/firefox.spec b/firefox.spec index 43a5c77..1048b9d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -71,7 +71,7 @@ %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/langpacks -%global tarballdir mozilla-release +%global tarballdir %{name}-%{version} %define official_branding 1 %define build_langpacks 1 @@ -85,14 +85,14 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 41.0.2 -Release: 2%{?pre_tag}%{?dist} +Version: 42.0 +Release: 1%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20151015.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20151029.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -114,6 +114,7 @@ Patch20: firefox-build-prbool.patch Patch21: firefox-ppc64le.patch Patch24: firefox-debug.patch Patch25: rhbz-1219542-s390-build.patch +Patch26: firefox-nspr.patch # Fedora specific patches # Unable to install addons from https pages @@ -126,11 +127,7 @@ Patch221: firefox-fedora-ua.patch # Upstream patches # Gtk3 upstream patches -Patch420: mozilla-1160154.patch Patch425: mozilla-1192243.patch -Patch426: mozilla-1180971.patch -Patch427: mozilla-1190935.patch -Patch428: mozilla-1205045.patch # Fix Skia Neon stuff on AArch64 Patch500: aarch64-fix-skia.patch @@ -253,11 +250,12 @@ cd %{tarballdir} %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool -%patch21 -p2 -b .ppc64le -%patch24 -p1 -b .debug +#%patch21 -p2 -b .ppc64le +#%patch24 -p1 -b .debug %ifarch s390 %patch25 -p1 -b .rhbz-1219542-s390 %endif +%patch26 -p2 -b .nspr %patch3 -p2 -b .arm @@ -267,19 +265,15 @@ cd %{tarballdir} %patch204 -p2 -b .966424 %patch215 -p1 -b .addons %patch219 -p2 -b .rhbz-1173156 -%patch220 -p1 -b .rhbz-1014858 +#%patch220 -p1 -b .rhbz-1014858 %patch221 -p2 -b .fedora-ua # Upstream patches %if %{toolkit_gtk3} -%patch420 -p1 -b .1160154 %patch425 -p1 -b .1192243 -%patch426 -p1 -b .1180971 -%patch427 -p1 -b .1190935 -#%patch428 -p1 -b .1205045 %endif -%patch500 -p1 +#%patch500 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -748,6 +742,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/browser/crashreporter-override.ini %endif %{mozappdir}/*.so +%{mozappdir}/gtk2/*.so %{mozappdir}/chrome.manifest %{mozappdir}/components %{mozappdir}/defaults/pref/channel-prefs.js @@ -769,6 +764,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Oct 29 2015 Martin Stransky <stransky@redhat.com> - 42.0-1 +- Update to 42.0 + * Thu Oct 15 2015 Petr Jasicek <pjasicek@redhat.com> - 41.0.2-2 - Added private browsing action to desktop file - rhbz#1262564 |