From 0424659ab4f369e37d21b6d40d61e01b7320d6a0 Mon Sep 17 00:00:00 2001
From: xujing <xujing125@huawei.com>
Date: Thu, 21 Mar 2024 19:26:04 +0800
Subject: [PATCH] don't delete the commented code in macros

(cherry picked from commit a290bf836c886b962465eb8f2c5109778dc0f10b)
---
 Delete-the-commented-code.patch | 40 +--------------------------------
 openEuler-rpm-config.spec       |  5 ++++-
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/Delete-the-commented-code.patch b/Delete-the-commented-code.patch
index 8f27e4e..b9f0469 100644
--- a/Delete-the-commented-code.patch
+++ b/Delete-the-commented-code.patch
@@ -5,8 +5,7 @@ Subject: [PATCH] Delete the commented code
 
 ---
  brp-digest-list | 1 -
- macros          | 7 -------
- 2 files changed, 8 deletions(-)
+ 1 file changed, 1 deletion(-)
 
 diff --git a/brp-digest-list b/brp-digest-list
 index 77248c9..7de42b7 100644
@@ -20,43 +19,6 @@ index 77248c9..7de42b7 100644
  TMPDIR="/tmp"
  BIN_PKG_FILES=${TMPDIR}/${3%%.rpm}
  cat - > $BIN_PKG_FILES
-diff --git a/macros b/macros
-index 52df0f6..bf672e2 100644
---- a/macros
-+++ b/macros
-@@ -16,10 +16,8 @@
- %_fmoddir		%{_libdir}/gfortran/modules
- 
- %_enable_debug_packages 1
--#%_include_minidebuginfo 1
- %_include_gdb_index     1
- %_debugsource_packages  1
--#%_debuginfo_subpackages 1
- 
- %_build_id_links none
- 
-@@ -188,11 +186,9 @@
- # Fail linking if there are undefined symbols.  Required for proper
- # ELF symbol versioning support.  Disabled by default.
- # Use "%define _ld_strict_symbol_defs 1" to enable.
--#%_ld_strict_symbol_defs		1
- %_ld_symbols_flags		%{?_ld_strict_symbol_defs:-Wl,-z,defs}
- 
- # use "%define _ld_as_needed 1" to enable.
--#%_ld_as_needed		1
- %_ld_as_needed_flags	%{?_ld_as_needed:-Wl,--as-needed}
- 
- %__global_compiler_flags	-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} 
-@@ -304,9 +300,6 @@ Requires:       man info \
- %description help \
- Man pages and other related documents for %{name}.
- 
--#%sbin_installinfo_rm bc.info
--#%sbin_installinfo_rm bc.info.gz
--
- %install_info() \
- /sbin/install-info %1 %{_infodir}/dir || :
- 
 -- 
 2.33.0
 
diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec
index b2485c2..8975cb1 100644
--- a/openEuler-rpm-config.spec
+++ b/openEuler-rpm-config.spec
@@ -3,7 +3,7 @@
 
 Name:		%{vendor}-rpm-config
 Version:	30
-Release:	40
+Release:	41
 License:	GPL+
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/openeuler/openEuler-rpm-config
@@ -140,6 +140,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir
 %{rpmvdir}/find-requires.ksyms
 
 %changelog
+* Mon Apr 29 2024 xujing <xujing125@huawei.com> - 30-41
+- don't delete the commented code in macros
+
 * Tue Mar 5 2024 hongjinghao <hongjinghao@huawei.com> - 30-40
 - Delete the commented code
 
-- 
Gitee