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

Merge branch 'master' into f27

Browse Source
This commit is contained in:
Martin Stransky 2018-04-24 11:34:25 +02:00
commit 4f2e44926f
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -286,3 +286,5 @@ firefox-3.6.4.source.tar.bz2
/3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2 /3db9e3d52b17563efca181ccbb50deb8660c59ae.tar.bz2
/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2 /239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2
/firefox-langpacks-59.0.2-20180327.tar.xz /firefox-langpacks-59.0.2-20180327.tar.xz
/firefox-60.0b13.source.tar.xz
/firefox-langpacks-60.0b13-20180418.tar.xz

25
firefox.spec
View File

@ -61,12 +61,12 @@
%endif %endif
%if %{?system_nss} %if %{?system_nss}
%global nspr_version 4.17.0 %global nspr_version 4.19
# NSS/NSPR quite often ends in build override, so as requirement the version # NSS/NSPR quite often ends in build override, so as requirement the version
# we're building against could bring us some broken dependencies from time to time. # we're building against could bring us some broken dependencies from time to time.
#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version} %global nspr_build_version %{nspr_version}
%global nss_version 3.34 %global nss_version 3.36.1
#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) #%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%global nss_build_version %{nss_version} %global nss_build_version %{nss_version}
%endif %endif
@ -80,11 +80,11 @@
%global mozappdir %{_libdir}/%{name} %global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks %global langpackdir %{mozappdir}/langpacks
%global release_hash 239e434d6d2b8e1e2b697c3416d1e96d48fe98e5 %global tarballdir firefox-%{version}
%global tarballdir mozilla-release-%{release_hash}
%global official_branding 1 %global official_branding 1
%global build_langpacks 1 %global build_langpacks 1
%global pre_version b13
%global enable_mozilla_crashreporter 0 %global enable_mozilla_crashreporter 0
%if !%{debug_build} %if !%{debug_build}
@ -95,13 +95,13 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 59.0.2 Version: 60.0
Release: 1%{?pre_tag}%{?dist} Release: 0.1%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/%{release_hash}.tar.bz2 Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20180327.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20180418.tar.xz
%endif %endif
Source10: firefox-mozconfig Source10: firefox-mozconfig
Source12: firefox-redhat-default-prefs.js Source12: firefox-redhat-default-prefs.js
@ -295,9 +295,9 @@ This package contains results of tests executed during build.
%ifarch s390 %ifarch s390
%patch25 -p1 -b .rhbz-1219542-s390 %patch25 -p1 -b .rhbz-1219542-s390
%endif %endif
%patch29 -p1 -b .big-endian #%patch29 -p1 -b .big-endian
%patch37 -p1 -b .jit-atomic-lucky %patch37 -p1 -b .jit-atomic-lucky
%patch39 -p1 -b .fix-attr-order #%patch39 -p1 -b .fix-attr-order
%patch3 -p1 -b .arm %patch3 -p1 -b .arm
@ -311,7 +311,7 @@ This package contains results of tests executed during build.
%ifarch aarch64 %ifarch aarch64
%patch226 -p1 -b .1354671 %patch226 -p1 -b .1354671
%endif %endif
%patch230 -p1 -R -b .fedora-enable-csd.patch #%patch230 -p1 -R -b .fedora-enable-csd.patch
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
%patch406 -p1 -b .256180 %patch406 -p1 -b .256180
@ -844,6 +844,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Apr 24 2018 Martin Stransky <stransky@redhat.com> - 60.0-0.1
- Update to 60.0 Beta 14
* Tue Mar 27 2018 Jan Horak <jhorak@redhat.com> - 59.0.2-1 * Tue Mar 27 2018 Jan Horak <jhorak@redhat.com> - 59.0.2-1
- Update to 59.0.2 - Update to 59.0.2

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2) = db8f55954df3af554e7a614eaece4aed995794dac6e2d828b2f9c175d8a6b89e109c26ced41a43df9ad24e01d079cadf13d16c6a9bdd1887bc9898d34408e8e6 SHA512 (firefox-60.0b13.source.tar.xz) = 687c70f379a5c4991993bf840f87bd6ffafbf6e5fb8c0fe10655048a54c810870c3306a480aa75b18250d29350d4a1ecfbfe867a1173b4c4e5b2e447bf369f82
SHA512 (firefox-langpacks-59.0.2-20180327.tar.xz) = 0822521b52b2a1879e3c78dd11cf173117aeae9cf4a4ee4aa31ddef356f58ecb61f07da045550ba33aa4faaaa1362c6c2ad9ebb5685f6e0c0df1aa59283e7ad8 SHA512 (firefox-langpacks-60.0b13-20180418.tar.xz) = dce66d5d3a85208691f801ec8780921154b3fab813f3a51cc02d6fdbc7ef1e18cd87dfc2757dd8b7edc3d505b39bad2c39d6cb7c4a6714b77c291a5fef75618f