From 008f254cb2c94d82348c1fca4839dd12d6c4fe28 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 07:02:29 +0000
Subject: import flatpak-rpm-macros-32-3.module+el8.4.0+9772+81227f27


---

diff --git a/SOURCES/macros.flatpak b/SOURCES/macros.flatpak
index 31051b7..d465f91 100644
--- a/SOURCES/macros.flatpak
+++ b/SOURCES/macros.flatpak
@@ -1,7 +1,7 @@
 %flatpak	1
 %_prefix	/app
 %_sysconfdir	%{_prefix}/etc
-%__global_ldflags %{build_ldflags} -L%{_libdir}
+%build_ldflags -Wl,-z,relro %{_ld_symbols_flags} %{_hardened_ldflags} -L%{_libdir}
 %python2_sitelib	%{_prefix}/lib/python2.7/site-packages
 %python2_sitearch	%{_libdir}/python2.7/site-packages
 %python3_sitelib	%{_prefix}/lib/python3.6/site-packages
@@ -32,22 +32,16 @@
   export CONFIG_SITE\
   ACLOCAL_PATH="%{_datadir}/aclocal:%{_usr}/share/aclocal"\
   export ACLOCAL_PATH\
-  CFLAGS="%{optflags}"\
-  export CFLAGS\
   CPATH="%{_prefix}/include"\
   export CPATH\
   CPLUS_INCLUDE_PATH="%{_prefix}/include"\
   export CPLUS_INCLUDE_PATH\
-  CXXFLAGS="%{optflags}"\
-  export CXXFLAGS\
   C_INCLUDE_PATH="%{_prefix}/include"\
   export C_INCLUDE_PATH\
   GI_TYPELIB_PATH="%{_libdir}/girepository-1.0:%{_usr}/%{_lib}/girepository-1.0"\
   export GI_TYPELIB_PATH\
   INFOPATH="%{_datadir}/info"\
   export INFOPATH\
-  LDFLAGS="%{?__global_ldflags}"\
-  export LDFLAGS\
   MANPATH="%{_datadir}/man:"\
   export MANPATH\
   OBJC_INCLUDE_PATH="%{_prefix}/include"\
diff --git a/SPECS/flatpak-rpm-macros.spec b/SPECS/flatpak-rpm-macros.spec
index 2d2b608..d998680 100644
--- a/SPECS/flatpak-rpm-macros.spec
+++ b/SPECS/flatpak-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           flatpak-rpm-macros
 Version:        32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Macros for building RPMS for flatpaks
 Source0:        macros.flatpak
 Source1:        distutils.cfg
@@ -44,6 +44,9 @@ install -t $RPM_BUILD_ROOT%{_rpmconfigdir} -m 755 %{SOURCE3}
 %{_rpmconfigdir}/fontconfig-flatpak.prov
 
 %changelog
+* Mon Feb  1 2021 Owen Taylor <otaylor@redhat.com> - 32-3
+- flatpak-rpm-macros :Don't set CFLAGS/CXXFLAGS/LDFLAGS globally in %___build_pre
+
 * Wed Oct 28 2020 Owen Taylor <otaylor@redhat.com> - 32-2
 - Override RPM's fontconfig auto-provide to handle /app/share/fonts