From 11f2d0bf92df599c013f3b90f0a15e404a10f5cc Mon Sep 17 00:00:00 2001
From: xinyingchao <yuanxin24@h-partners.com>
Date: Mon, 28 Mar 2022 11:34:18 +0800
Subject: [PATCH] reset %defattr when -k option specified

---
 ...en-users-want-to-keep-files-permissi.patch | 28 +++++++++++++++++++
 rpmrebuild.spec                               | 10 ++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch

diff --git a/bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch b/bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
new file mode 100644
index 0000000..87f82bd
--- /dev/null
+++ b/bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
@@ -0,0 +1,28 @@
+From 10ef16bc38f4b3480a60fff829df09cb6b02761b Mon Sep 17 00:00:00 2001
+From: licunlong1 <licunlong1@huawei.com>
+Date: Wed, 9 Mar 2022 16:40:49 +0800
+Subject: [PATCH] reset %defattr when users want to keep files permission, uid
+ and gid
+
+---
+ rpmrebuild_files.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/rpmrebuild_files.sh b/rpmrebuild_files.sh
+index 30bd91d..f0798a8 100755
+--- a/rpmrebuild_files.sh
++++ b/rpmrebuild_files.sh
+@@ -69,6 +69,10 @@ if [ "X$RPMREBUILD_CAP_FROM_FS" = "Xyes" ]; then
+ 	fi
+ fi
+ 
++if [ "X$RPMREBUILD_PUG_FROM_FS" = "Xyes" ]; then
++    echo "%defattr(-,-,-,-)"
++fi
++
+ while :; do
+ 	read file_type
+ 	[ "x$file_type" = "x" ] && break
+-- 
+2.23.0
+
diff --git a/rpmrebuild.spec b/rpmrebuild.spec
index 2276f93..898f20e 100644
--- a/rpmrebuild.spec
+++ b/rpmrebuild.spec
@@ -1,11 +1,13 @@
 Name:           rpmrebuild
 Version:        2.16
-Release:        1
+Release:        2
 Summary:        A tool to build a rpm file from the rpm database
 License:        GPLv2+
 URL:            http://rpmrebuild.sourceforge.net
 Source0:        https://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.tar.gz
 
+Patch9000:      bugfix-reset-defattr-when-users-want-to-keep-files-permissi.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 Requires:       rpm grep bash cpio textutils rpm-build
@@ -56,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/
 %{_mandir}/fr/man1/*.gz
 
 %changelog
+* Mon Mar 28 2022 yuanxin <yuanxin24@h-partners.com> - 2.16-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:reset %defattr when -k option specified
+
 * Mon Jul 19 2021 yuanxin <yuanxin24@huawei.com> - 2.16-1
 - Type:enhancement
 - ID:NA