From f90303c185f00cac1d710d46a02902459badd108 Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 8 Oct 2018 15:46:22 -0400 Subject: pull latest 56.2.3 build from upstream copr --- waterfox/waterfox.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index d45d31f..7955ae5 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -3,7 +3,7 @@ %global date 20180911 %global with_snapshot 1 -%global freebsd_rev 478244 +%global freebsd_rev 480450 %global freebsd_root %{name}-FreeBSD-patches-r%{freebsd_rev} %if 0%{?with_snapshot} @@ -69,6 +69,11 @@ # Build as a debug package? %global debug_build 0 +%global disable_elfhack 0 +%if 0%{?fedora} > 28 +%global disable_elfhack 1 +%endif + %global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html %global waterfox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} # Minimal required versions @@ -286,6 +291,7 @@ BuildRequires: xorg-x11-server-Xvfb %endif BuildRequires: rust BuildRequires: cargo +BuildRequires: clang-devel Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -388,7 +394,7 @@ done # 2: no apply # 3: uncertain for i in \ - 702179 991253 1021761 1144632 1288587 1452576 1425930 1469914 1469309 1470260 1472925 \ + 702179 991253 1021761 1144632 1288587 1452576 \ 1388744 1413143 \ 1447519 do @@ -460,6 +466,10 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig echo "ac_add_options --disable-elf-hack" >> .mozconfig %endif +%if 0%{?disable_elfhack} +echo "ac_add_options --disable-elf-hack" >> .mozconfig +%endif + %if %{?alsa_backend} echo "ac_add_options --enable-alsa" >> .mozconfig %endif @@ -893,6 +903,12 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Oct 08 2018 Phantom X - 56.2.3-2.20180911git432b427 +- Some spec cleanups adapted from Fedora Firefox +- BR: clang-devel +- Disable elfhack for Fedora 29+ +- Remove old gcc 7.2 fix + * Fri Sep 14 2018 Phantom X - 56.2.3-1.20180911git432b427 - New release/snapshot -- cgit From 73cb3b37849feead0eb47abae332bfee2cc347bb Mon Sep 17 00:00:00 2001 From: B Stack Date: Mon, 15 Oct 2018 14:14:32 -0400 Subject: waterfox: bump to 56.2.4 --- waterfox/waterfox.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'waterfox/waterfox.spec') diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 7955ae5..70248d7 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -1,6 +1,6 @@ -%global commit 432b42717b0678a933f9d0731f02f9d1d32bdec2 +%global commit 9c2c0e0c5593abb40b6093d9b2a28b294b2b0ce9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20180911 +%global date 20181008 %global with_snapshot 1 %global freebsd_rev 480450 @@ -123,7 +123,7 @@ Summary: Waterfox Web browser Name: waterfox -Version: 56.2.3 +Version: 56.2.4 Release: 2%{?gver}%{?dist} URL: https://www.waterfoxproject.org License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -903,6 +903,9 @@ fi #--------------------------------------------------------------------- %changelog +* Sun Oct 14 2018 Phantom X - 56.2.4-1.20181008git9c2c0e0 +- New release/snapshot + * Mon Oct 08 2018 Phantom X - 56.2.3-2.20180911git432b427 - Some spec cleanups adapted from Fedora Firefox - BR: clang-devel -- cgit