From 73c24a4d458769b6a8560eb855a4f7a2545fe998 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 17 Aug 2022 10:31:20 +0200
Subject: [PATCH] Drop hardened_build option

Now that we correctly use Fedora's ldflags (previous commit), there's
no need to do anything special to enable hardened build. All of it is
already included in the default build flags.
---
 firefox.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index bb7b33f..26bd17a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -65,7 +65,6 @@ ExcludeArch: s390x
 %else
 %global system_libvpx     0
 %endif
-%global hardened_build    1
 %global system_jpeg       1
 %global disable_elfhack   1
 %global use_bundled_cbindgen  1
@@ -657,9 +656,6 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
 # Workaround for mozbz#1531309
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
-%if %{?hardened_build}
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
-%endif
 %if %{?debug_build}
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
 %endif
@@ -1074,6 +1070,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - Drop obsolete build conditionals
 - Drop unused patches
 - Use build_ldflags
+- Drop hardened_build option
 
 * Tue Aug 23 2022 Jan Horak <jhorak@redhat.com> - 104.0-4
 - Rebuild due to ppc64le fixes