From 1d1959bada022837ba7ac37046cf6b8baa007572 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sat, 15 Apr 2023 17:40:46 +0800
Subject: [PATCH] Drop unused flags for fortran

---
 brp-mangle-shebangs    | 1 -
 macros                 | 6 ++----
 system-rpm-config.spec | 5 ++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/brp-mangle-shebangs b/brp-mangle-shebangs
index ab7af60..5255204 100755
--- a/brp-mangle-shebangs
+++ b/brp-mangle-shebangs
@@ -143,7 +143,6 @@ while IFS= read -r line; do
   shebang=$(echo "$shebang" | sed -r -e 's@^(.+/)env (.+)$@\1\2@')
 
   # If the shebang now starts with /bin, change it to /usr/bin
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1581757
   shebang=$(echo "$shebang" | sed -r -e 's@^/bin/@/usr/bin/@')
 
   # Replace ambiguous python with python2
diff --git a/macros b/macros
index 2f4d46c..eb8dfa8 100644
--- a/macros
+++ b/macros
@@ -66,7 +66,7 @@
 
 # Fortran compiler flags.  Makefiles use both FFLAGS and FCFLAGS as
 # the corresponding variable names.
-%build_fflags %{optflags} -I%{_fmoddir}
+%build_fflags %(echo %{optflags} | sed -e 's/-Werror=format-security//') -I%{_fmoddir}
 
 # When clang is used as a linker driver, it does not auto-detect the LTO
 # bytecode and neither does bfd, so we need to explicitly pass the -flto
@@ -337,7 +337,7 @@ print(result)
 # Add extra information to binary objects created by the compiler:
 # https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30)
 # ...except on armv7hl, which has an issue whose root-cause isn't
-# clear yet: https://bugzilla.redhat.com/show_bug.cgi?id=1951492
+# clear yet
 # Use "%undefine _annotated_build" to disable.
 %_annotated_build	1
 %_annobin_gcc_plugin	-specs=/usr/lib/rpm/anolis/anolis-annobin-cc1
@@ -356,7 +356,6 @@ print(result)
 #%_ld_strict_symbol_defs		1
 %_ld_symbols_flags		%{?_ld_strict_symbol_defs:-Wl,-z,defs}
 
-# https://fedoraproject.org/wiki/Changes/RemoveExcessiveLinking
 # use "%undefine _ld_as_needed" to disable.
 %_ld_as_needed		1
 %_ld_as_needed_flags	%{?_ld_as_needed:-Wl,--as-needed}
@@ -393,7 +392,6 @@ print(result)
 #==============================================================================
 # ---- Generic auto req/prov filtering macros
 #
-# https://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
 
 # prevent anything matching from being scanned for provides
 %filter_provides_in(P) %{expand: \
diff --git a/system-rpm-config.spec b/system-rpm-config.spec
index 82d6de2..7d378aa 100644
--- a/system-rpm-config.spec
+++ b/system-rpm-config.spec
@@ -1,4 +1,4 @@
-%define anolis_release 32
+%define anolis_release 33
 
 Summary: Anolis OS specific rpm configuration files
 Name: system-rpm-config
@@ -211,6 +211,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua
 %license MulanPSL
 
 %changelog
+* Sat Apr 15 2023 Funda Wang <fundawang@yeah.net> - 1:23-33
+- Drop unused flags for fortran
+
 * Mon Apr 10 2023 Funda Wang <fundawang@yeah.net> - 1:23-32
 - Fix clean_perl directory depth
 
-- 
Gitee