diff --git a/0002-rust-macros-do-not-strip.patch b/0002-rust-macros-do-not-strip.patch new file mode 100644 index 0000000000000000000000000000000000000000..202431bb6639cca3db7db9dba191b300933c2ac5 --- /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 cf7a178dec84cf47b49e910c830d76a462680770..eab32d8d542eb1028f05851ea2161a6bfc6b40f7 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -3,13 +3,15 @@ %global debug_package %{nil} Name: rust-packaging +Epoch: 1 Version: 23 -Release: 1 +Release: 5 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 @@ -21,8 +23,10 @@ BuildRequires: python3-termcolor python3-jinja2 BuildRequires: python3-pyparsing python3-tqdm python3-requests # gawk is needed for stripping dev-deps in macro -Requires: gawk python3-rust2rpm = %{version}-%{release} +Requires: gawk python3-rust2rpm = %{epoch}:%{version}-%{release} Requires: rust-srpm-macros rust cargo +Obsoletes: rust-srpm-macros < 1:23 +Obsoletes: cargo-rpm-macros < 1:23 %description The package provides macros for building projects in Rust @@ -33,7 +37,7 @@ Summary: Convert Rust packages to RPM Requires: cargo -Provides: rust2rpm = %{version}-%{release} +Provides: rust2rpm = %{epoch}:%{version}-%{release} %{?python_provide:%python_provide python3-rust2rpm} %description -n python3-rust2rpm @@ -61,14 +65,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 +78,21 @@ PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \ %{python3_sitelib}/rust2rpm-*.dist-info/ %changelog +* Thu Oct 30 2025 wangkai <13474090681@163.com> - 1:23-5 +- Fix duplicate rpm names to update release 5 + +* Thu Oct 23 2025 Funda Wang - 1:23-1 +- bump epoch so that it won't be obsoleted by wrongly imported packages + +* Tue Aug 19 2025 Funda Wang - 23-4 +- revert config.toml change as there are too many downstream packages affected + +* Sun Aug 17 2025 Funda Wang - 23-3 +- use config.toml rather than config for projects + +* Mon Aug 04 2025 Funda Wang - 23-2 +- do not strip binaries, as it is required for debugsource generating + * Tue Jul 18 2023 Dongxing Wang - 23-1 - update to 23