Compare commits
No commits in common. 'i10ce' and 'epel9' have entirely different histories.
@ -1 +1,24 @@
|
||||
SOURCES/rust-packaging-26.3.tar.gz
|
||||
/rust2rpm-4.tar.xz
|
||||
/rust2rpm-5.tar.xz
|
||||
/rust2rpm-6.tar.xz
|
||||
/rust2rpm-7.tar.xz
|
||||
/rust2rpm-8.tar.xz
|
||||
/rust2rpm-9.tar.xz
|
||||
/rust2rpm-10.tar.xz
|
||||
/rust2rpm-11.tar.xz
|
||||
/rust2rpm-12.tar.xz
|
||||
/rust2rpm-13.tar.xz
|
||||
/rust2rpm-14.tar.xz
|
||||
/rust2rpm-15.tar.xz
|
||||
/rust2rpm-v16.tar.gz
|
||||
/rust2rpm-v17.tar.gz
|
||||
/rust2rpm-v18.tar.gz
|
||||
/rust2rpm-v19.tar.gz
|
||||
/rust2rpm-v20.tar.gz
|
||||
/rust2rpm-v21.tar.gz
|
||||
/rust2rpm-v22.tar.gz
|
||||
/rust2rpm-v23.tar.gz
|
||||
/rust-packaging-24.tar.gz
|
||||
/rust-packaging-25.0.tar.gz
|
||||
/rust-packaging-25.1.tar.gz
|
||||
/rust-packaging-25.2.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
8431e3c8b3ae8c9be19fa7cc68c25f8aa2616c70 SOURCES/rust-packaging-26.3.tar.gz
|
||||
@ -0,0 +1,27 @@
|
||||
From c1cb014722147a3373a7d7ebbf99781cbb335cbf Mon Sep 17 00:00:00 2001
|
||||
From: Fabio Valentini <decathorpe@gmail.com>
|
||||
Date: Fri, 13 Oct 2023 00:31:15 +0200
|
||||
Subject: [PATCH] Temporarily accept cargo_prep -V flag for spec compatibiltiy
|
||||
with RHEL
|
||||
|
||||
---
|
||||
macros.d/macros.cargo | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo
|
||||
index e99f5a6..05159d8 100644
|
||||
--- a/macros.d/macros.cargo
|
||||
+++ b/macros.d/macros.cargo
|
||||
@@ -54,7 +54,8 @@
|
||||
# -v <directory> - use vendored sources from <directory> instead of
|
||||
# %%cargo_registry
|
||||
# -N - Don't set up any registry. Only set up the build configuration.
|
||||
-%cargo_prep(v:N)\
|
||||
+%cargo_prep(V:v:N)\
|
||||
+%{-V:%{?fedora:%{error:The -V flag for cargo_prep is not supported in Fedora}}}\
|
||||
%{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\
|
||||
(\
|
||||
set -euo pipefail\
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
%bcond_without check
|
||||
|
||||
Name: rust-packaging
|
||||
Version: 25.2
|
||||
Release: %autorelease
|
||||
Summary: RPM macros and generators for building Rust packages
|
||||
License: MIT
|
||||
|
||||
URL: https://pagure.io/fedora-rust/rust-packaging
|
||||
Source: %{url}/archive/%{version}/rust-packaging-%{version}.tar.gz
|
||||
|
||||
# temporary patch for compatibility with RHEL / ELN:
|
||||
# The %%cargo_prep macro in RHEL / ELN accepts a -V flag. Using the same spec
|
||||
# file for both Fedora and ELN would cause spec file parsing errors because
|
||||
# the -V flag is not known in Fedora.
|
||||
Patch: 0001-Temporarily-accept-cargo_prep-V-flag-for-spec-compat.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%if %{with check}
|
||||
BuildRequires: python3.11-pytest
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
|
||||
%package -n rust-srpm-macros-epel
|
||||
Summary: RPM macros for building Rust projects
|
||||
# Require rust-srpm-macros from RHEL
|
||||
Requires: rust-srpm-macros
|
||||
|
||||
%description -n rust-srpm-macros-epel
|
||||
RPM macros for building source packages for Rust projects.
|
||||
|
||||
%package -n cargo-rpm-macros
|
||||
Summary: RPM macros for building projects with cargo
|
||||
|
||||
# obsolete + provide rust-packaging (removed in Fedora 38)
|
||||
Obsoletes: rust-packaging < 24
|
||||
Provides: rust-packaging = %{version}-%{release}
|
||||
|
||||
Requires: cargo2rpm >= 0.1.8
|
||||
|
||||
Requires: cargo
|
||||
Requires: gawk
|
||||
Requires: grep
|
||||
|
||||
Requires: rust-srpm-macros-epel = %{version}-%{release}
|
||||
|
||||
%description -n cargo-rpm-macros
|
||||
RPM macros for building projects with cargo.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# nothing to do
|
||||
|
||||
%install
|
||||
install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.cargo
|
||||
install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust
|
||||
|
||||
# We don't install these on RHEL 9, as they conflict with the regular
|
||||
# rust-srpm-macros.
|
||||
# If we need to override these, they can be installed as
|
||||
# macros.zzz-rust-srpm-epel.
|
||||
%dnl install -D -p -m 0644 -t %{buildroot}/%{_rpmmacrodir} macros.d/macros.rust-srpm
|
||||
|
||||
install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo.attr
|
||||
install -D -p -m 0644 -t %{buildroot}/%{_fileattrsdir} fileattrs/cargo_vendor.attr
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
export MACRO_DIR=%{buildroot}%{_rpmmacrodir}
|
||||
# skip tests that fail due to whitespace differences in expected strings
|
||||
pytest-3.11 -vv -k "not test_cargo_prep"
|
||||
%endif
|
||||
|
||||
%files -n rust-srpm-macros-epel
|
||||
%license LICENSE
|
||||
%{_rpmmacrodir}/macros.rust
|
||||
%dnl %{_rpmmacrodir}/macros.rust-srpm
|
||||
|
||||
%files -n cargo-rpm-macros
|
||||
%license LICENSE
|
||||
%{_rpmmacrodir}/macros.cargo
|
||||
%{_fileattrsdir}/cargo.attr
|
||||
%{_fileattrsdir}/cargo_vendor.attr
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
Loading…
Reference in new issue