From a5cc688c711395e2fed7655eed2051c257dfb744 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Fri, 16 Jun 2023 15:58:30 +0100
Subject: [PATCH] Fix rebase to v11.4.3

---
 dogtag-pki.spec | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index c2680db..ace4780 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -59,6 +59,12 @@ ExcludeArch: i686
 
 %global p11_kit_trust /usr/lib64/pkcs11/p11-kit-trust.so
 
+################################################################################
+# Python
+################################################################################
+
+%global python_executable /usr/bin/python3
+
 ################################################################################
 # Java
 ################################################################################
@@ -251,7 +257,6 @@ to manage enterprise Public Key Infrastructure deployments.
 
 Summary:          %{product_name} Package
 %endif
-BuildArch:        noarch
 
 Obsoletes:        pki-symkey < %{version}
 Obsoletes:        %{product_id}-symkey < %{version}
@@ -826,26 +831,6 @@ This package provides test suite for %{product_name}.
 # (see /usr/lib/rpm/macros.d/macros.cmake)
 %set_build_flags
 
-# Remove all symbol table and relocation information from the executable.
-C_FLAGS="-s"
-
-%if 0%{?fedora}
-# https://sourceware.org/annobin/annobin.html/Test-gaps.html
-C_FLAGS="$C_FLAGS -fplugin=annobin"
-
-# https://sourceware.org/annobin/annobin.html/Test-cf-protection.html
-C_FLAGS="$C_FLAGS -fcf-protection=full"
-
-# https://sourceware.org/annobin/annobin.html/Test-optimization.html
-C_FLAGS="$C_FLAGS -O2"
-
-# https://sourceware.org/annobin/annobin.html/Test-glibcxx-assertions.html
-C_FLAGS="$C_FLAGS -D_GLIBCXX_ASSERTIONS"
-
-# https://sourceware.org/annobin/annobin.html/Test-lto.html
-C_FLAGS="$C_FLAGS -fno-lto"
-%endif
-
 pkgs=base\
 %{?with_server:,server}\
 %{?with_ca:,ca}\
@@ -875,7 +860,6 @@ pkgs=base\
     --sysconf-dir=%{_sysconfdir} \
     --share-dir=%{_datadir} \
     --cmake=%{__cmake} \
-    --c-flags="$C_FLAGS" \
     --java-home=%{java_home} \
     --jni-dir=%{_jnidir} \
     --unit-dir=%{_unitdir} \