diff --git a/Delete-the-commented-code.patch b/Delete-the-commented-code.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f27e4e763ee5aad7f80719f1fe42dd426d6b781 --- /dev/null +++ b/Delete-the-commented-code.patch @@ -0,0 +1,62 @@ +From c7605385b9d838be78a87de02a48eaaa6e69b4b2 Mon Sep 17 00:00:00 2001 +From: hongjinghao +Date: Tue, 5 Mar 2024 20:22:59 +0800 +Subject: [PATCH] Delete the commented code + +--- + brp-digest-list | 1 - + macros | 7 ------- + 2 files changed, 8 deletions(-) + +diff --git a/brp-digest-list b/brp-digest-list +index 77248c9..7de42b7 100644 +--- a/brp-digest-list ++++ b/brp-digest-list +@@ -9,7 +9,6 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then + fi + + # Create temporary file listing files in the manifest +-#[ -n "$TMPDIR" ] || TMPDIR="/tmp" + 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 a0b2d22c8f431236858d7a3f834ba730b64bcddc..74e6377981ade0265e6133b8ba1f4d5e78e8c9f9 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 23 +Release: 24 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -19,6 +19,7 @@ Patch4: check-if-the-file-is-a-symbolic-link-in-brp-digest-list.patch Patch9000: openEuler-remove-fexceptions.patch Patch9001: fix-the-ELF-file-cannot-be-found-due-to-escape-of.patch Patch9002: add-brp-scripts-to-delete-rpath.patch +Patch9003: Delete-the-commented-code.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -118,6 +119,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Tue Mar 5 2024 hongjinghao - 30-24 +- Delete the commented code + * Tue Nov 21 2023 xujing - 30-23 - excute brp_chrpath before arch_install_post