From 9793dd5fbd96180a72d6dbccafb48d9ecf2b7853 Mon Sep 17 00:00:00 2001
From: Yangyang Shen <shenyangyang4@huawei.com>
Date: Fri, 19 Mar 2021 20:23:50 +0800
Subject: [PATCH] Change the name of spec to openEuler-rpm-spec and fix few
 bugs

---
 Fix-a-typo-in-brp-digest-list.patch           | 26 ++++++++++++++
 openEuler-remove-fexceptions.patch            | 36 +++++++++++++++++++
 ...m-config.spec => openEuler-rpm-config.spec |  7 +++-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 Fix-a-typo-in-brp-digest-list.patch
 create mode 100644 openEuler-remove-fexceptions.patch
 rename generic-rpm-config.spec => openEuler-rpm-config.spec (96%)

diff --git a/Fix-a-typo-in-brp-digest-list.patch b/Fix-a-typo-in-brp-digest-list.patch
new file mode 100644
index 0000000..305237d
--- /dev/null
+++ b/Fix-a-typo-in-brp-digest-list.patch
@@ -0,0 +1,26 @@
+From a82057c590f958d10898c2e5f7211241be3dfd7a Mon Sep 17 00:00:00 2001
+From: Roberto Sassu <roberto.sassu@huawei.com>
+Date: Fri, 26 Feb 2021 09:00:06 +0100
+Subject: [PATCH] Fix a typo in brp-digest-list
+
+Rename RPM_PACKAGE_NAM to RPM_PACKAGE_NAME.
+---
+ brp-digest-list | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/brp-digest-list b/brp-digest-list
+index 435b962..c3b2156 100644
+--- a/brp-digest-list
++++ b/brp-digest-list
+@@ -86,7 +86,7 @@ if [[ "$(basename $BIN_PKG_FILES)" =~ "digest-list-tools" && \
+ 
+ 	export BRP_PESIGN_FILES="$2/etc/ima/digest_lists/*"
+ 	export RPM_BUILD_ROOT
+-	export RPM_PACKAGE_NAM="digest-list-tools"
++	export RPM_PACKAGE_NAME="digest-list-tools"
+ 	export RPM_SOURCE_DIR="$(rpm --eval %_topdir)/SOURCES"
+ 
+ 	if [ -f "/usr/lib/rpm/brp-suse.d/brp-99-pesign" ]; then
+-- 
+2.26.2
+
diff --git a/openEuler-remove-fexceptions.patch b/openEuler-remove-fexceptions.patch
new file mode 100644
index 0000000..d198123
--- /dev/null
+++ b/openEuler-remove-fexceptions.patch
@@ -0,0 +1,36 @@
+From 783b74a4778101223da41c8d3eb0457a1f9938f2 Mon Sep 17 00:00:00 2001
+From: Yangyang Shen <shenyangyang4@huawei.com>
+Date: Thu, 18 Mar 2021 16:00:27 +0800
+Subject: [PATCH] openEuler remove fexceptions
+
+---
+ macros | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/macros b/macros
+index b06faea..118614d 100644
+--- a/macros
++++ b/macros
+@@ -27,8 +27,8 @@
+ # ---- compiler flags.
+ 
+ %build_cflags %{optflags}
+-%build_cxxflags %{optflags}
+-%build_fflags %{optflags} -I%{_fmoddir}
++%build_cxxflags %{optflags} -fexceptions
++%build_fflags %{optflags} -fexceptions -I%{_fmoddir}
+ %build_ldflags -Wl,-z,relro %{_ld_as_needed_flags} %{_ld_symbols_flags} %{_hardened_ldflags}
+ 
+ %set_build_flags \
+@@ -177,7 +177,7 @@
+ #%_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 -fexceptions -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} 
++%__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} 
+ 
+ # Automatically trim changelog entries after 2 years
+ %_changelog_trimtime	%{lua:print(os.time() - 2 * 365 * 86400)}
+-- 
+2.23.0
+
diff --git a/generic-rpm-config.spec b/openEuler-rpm-config.spec
similarity index 96%
rename from generic-rpm-config.spec
rename to openEuler-rpm-config.spec
index 9d7901d..f3b7f3e 100644
--- a/generic-rpm-config.spec
+++ b/openEuler-rpm-config.spec
@@ -9,7 +9,7 @@
 
 Name:		%{vendor}-rpm-config
 Version:	30
-Release:	14
+Release:	15
 License:	GPL+
 Summary:	specific rpm configuration files
 URL:		https://gitee.com/openeuler/openEuler-rpm-config
@@ -17,11 +17,13 @@ URL:		https://gitee.com/openeuler/openEuler-rpm-config
 Source0:        https://gitee.com/openeuler/openEuler-rpm-config/repository/archive/%{version}.tar.gz
 
 Patch0:         fix-error-message-for-kmodtool.patch
+Patch1:         Fix-a-typo-in-brp-digest-list.patch
 
 Patch9000:      openEuler-replace-openEuler-with-_vendor-macro.patch
 %if %{vendor} != openEuler && %{change_vendor} == 1
 Patch9001:      openEuler-fix-brp-ldconfig.patch
 %endif
+Patch9002:      openEuler-remove-fexceptions.patch
 
 Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -147,6 +149,9 @@ popd
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Fri Mar 19 2021 shenyangyang <shenyangyang4@huawei.com> - 30-15
+- Change the name of spec to openEuler-rpm-spec and fix few bugs
+
 * Wed Mar 17 2021 shenyangyang <shenyangyang4@huawei.com> - 30-14
 - Add for support for change vendor
 
-- 
Gitee