From a90c612f9f7e9f8fe2cb37494b74c659b0227f54 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 4 Aug 2025 23:48:04 +0800
Subject: [PATCH] do not strip binaries, as it is required for debugsource
 generating

(cherry picked from commit 92c74ad7296d2564c78edd9f478fedeb2b774f1d)
---
 0002-rust-macros-do-not-strip.patch | 16 ++++++++++++++++
 rust-packaging.spec                 |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 0002-rust-macros-do-not-strip.patch

diff --git a/0002-rust-macros-do-not-strip.patch b/0002-rust-macros-do-not-strip.patch
new file mode 100644
index 0000000..202431b
--- /dev/null
+++ b/0002-rust-macros-do-not-strip.patch
@@ -0,0 +1,16 @@
+diff --git a/data/macros.rust b/data/macros.rust
+index efa46a3..2702a24 100644
+--- a/data/macros.rust
++++ b/data/macros.rust
+@@ -10,9 +10,8 @@
+   -Copt-level=%rustflags_opt_level
+   -Cdebuginfo=%rustflags_debuginfo
+   -Ccodegen-units=%rustflags_codegen_units
+-  -Clink-arg=-Wl,-z,relro
+-  -Clink-arg=-Wl,-z,now
+-  %{?_package_note_file:-Clink-arg=-Wl,-dT,%{_package_note_file}}
++  -Cstrip=none
++  %[0%{?_package_note_status} ? "-Clink-arg=%_package_note_flags" : ""]
+   --cap-lints=warn
+ }
+ 
diff --git a/rust-packaging.spec b/rust-packaging.spec
index cf7a178..163d0a5 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -4,12 +4,13 @@
 
 Name:           rust-packaging
 Version:        23
-Release:        1
+Release:        2
 Summary:        RPM macros for building Rust packages on various architectures
 License:        MIT
 URL:            https://pagure.io/fedora-rust/rust2rpm
 Source:         https://pagure.io/fedora-rust/rust2rpm/archive/v%{version}/rust2rpm-v%{version}.tar.gz
 Patch1:         0001-remove-test-spec-with-opensuse-tomlfile.patch
+Patch2:         0002-rust-macros-do-not-strip.patch
 
 BuildRequires:  python3-devel python3-setuptools
 BuildRequires:  python3-pbr python3-pip python3-wheel
@@ -61,14 +62,12 @@ PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \
 %{__python3} -m tox -e py%{python3_version_nodots} --current-env
 
 %files
-%defattr(-,root,root)
 %license LICENSE
 %{_rpmmacrodir}/macros.rust
 %{_rpmmacrodir}/macros.cargo
 %{_fileattrsdir}/cargo.attr
 
 %files -n python3-rust2rpm
-%defattr(-,root,root)
 %license LICENSE
 %{_bindir}/rust2rpm
 %{_bindir}/cargo-inspector
@@ -76,6 +75,9 @@ PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \
 %{python3_sitelib}/rust2rpm-*.dist-info/
 
 %changelog
+* Mon Aug 04 2025 Funda Wang <fundawang@yeah.net> - 23-2
+- do not strip binaries, as it is required for debugsource generating
+
 * Tue Jul 18 2023 Dongxing Wang <dxwangk@isoftstone.com> - 23-1
 - update to 23
 
-- 
Gitee