From 82291cc7456533a7b2adaadd426fc0fac75c002d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 2 Nov 2023 13:34:24 +0300 Subject: [PATCH] Remove files from SOURCES --- SOURCES/0ff9bb8.patch | 49 ------------------------------------------- SOURCES/3df6ad1.patch | 33 ----------------------------- SOURCES/801dd51.patch | 29 ------------------------- SOURCES/8690145.patch | 34 ------------------------------ SOURCES/b9d6410.patch | 26 ----------------------- 5 files changed, 171 deletions(-) delete mode 100644 SOURCES/0ff9bb8.patch delete mode 100644 SOURCES/3df6ad1.patch delete mode 100644 SOURCES/801dd51.patch delete mode 100644 SOURCES/8690145.patch delete mode 100644 SOURCES/b9d6410.patch diff --git a/SOURCES/0ff9bb8.patch b/SOURCES/0ff9bb8.patch deleted file mode 100644 index daf846c..0000000 --- a/SOURCES/0ff9bb8.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0ff9bb855cf6be46f26801d00dd8c057a11eecd9 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 17 Aug 2023 13:33:17 -0400 -Subject: [PATCH] Correct %__cargo and %__cargo_to_rpm paths - -%{_bindir} should not be used like this in specfiles or macros. It -breaks flatpak builds. - -Relates: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies ---- - fileattrs/cargo.attr | 4 ++-- - macros.d/macros.cargo | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/fileattrs/cargo.attr b/fileattrs/cargo.attr -index b97383d..0dabe9b 100644 ---- a/fileattrs/cargo.attr -+++ b/fileattrs/cargo.attr -@@ -1,3 +1,3 @@ --%__cargo_provides %{_bindir}/cargo2rpm provides --subpackage --feature=%{name} --%__cargo_requires %{_bindir}/cargo2rpm requires --subpackage --feature=%{name} -+%__cargo_provides /usr/bin/cargo2rpm provides --subpackage --feature=%{name} -+%__cargo_requires /usr/bin/cargo2rpm requires --subpackage --feature=%{name} - %__cargo_path ^%{cargo_registry}/[^/]+/Cargo\\.toml$ -diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo -index 672ae06..147a7ca 100644 ---- a/macros.d/macros.cargo -+++ b/macros.d/macros.cargo -@@ -6,7 +6,7 @@ - # features that have not been stabilized yet, i.e. the - # "-Z avoid-dev-deps" flag which is passed to cargo by the cargo_build, - # cargo_install, and cargo_test macros. --%__cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' %{_bindir}/cargo -+%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo - - # __cargo_common_opts: common command line flags for cargo - # -@@ -22,7 +22,7 @@ - %__cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps - - # __cargo_to_rpm: path to the default cargo2rpm executable --%__cargo_to_rpm %{_bindir}/cargo2rpm -+%__cargo_to_rpm /usr/bin/cargo2rpm - - # cargo_registry: path to the root of the directory-based "local cargo registry" - # with replaces the "crates.io" source --- -2.41.0 - diff --git a/SOURCES/3df6ad1.patch b/SOURCES/3df6ad1.patch deleted file mode 100644 index 20bdca8..0000000 --- a/SOURCES/3df6ad1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3df6ad1259c1741656affc26512f81631e9148f5 Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Mar 09 2023 20:44:10 +0000 -Subject: Correct %__rustc and %__rustdoc paths and docs - - -%{_bindir} should not be used like this in specfiles or macros. It -breaks flatpak builds. - -Also, correct docstring copy-paste errors. - -Relates: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies - ---- - -diff --git a/macros.d/macros.rust b/macros.d/macros.rust -index 1978f85..095cebc 100644 ---- a/macros.d/macros.rust -+++ b/macros.d/macros.rust -@@ -1,8 +1,8 @@ --# __cargo_to_rpm: path to the default rustc executable --%__rustc %{_bindir}/rustc -+# __rustc: path to the default rustc executable -+%__rustc /usr/bin/rustc - --# __cargo_to_rpm: path to the default rustdoc executable --%__rustdoc %{_bindir}/rustdoc -+# __rustdoc: path to the default rustdoc executable -+%__rustdoc /usr/bin/rustdoc - - # rustflags_opt_level: default optimization level - # - diff --git a/SOURCES/801dd51.patch b/SOURCES/801dd51.patch deleted file mode 100644 index dd06257..0000000 --- a/SOURCES/801dd51.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 801dd51f84ec5979c540dc2cca16edd088f72d7c Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Thu, 17 Aug 2023 17:28:34 -0400 -Subject: [PATCH] Correct %cargo_registry path - -%{_datadir} should not be used like this in specfiles or macros. It -breaks flatpak builds. - -Relates: https://docs.fedoraproject.org/en-US/packaging-guidelines/#_file_and_directory_dependencies ---- - macros.d/macros.cargo | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo -index 147a7ca..3d03e2e 100644 ---- a/macros.d/macros.cargo -+++ b/macros.d/macros.cargo -@@ -26,7 +26,7 @@ - - # cargo_registry: path to the root of the directory-based "local cargo registry" - # with replaces the "crates.io" source --%cargo_registry %{_datadir}/cargo/registry -+%cargo_registry /usr/share/cargo/registry - - # crate_instdir: path to the directory where library crates are installed, - # with version_no_tilde being the upstream version of the crate --- -2.41.0 - diff --git a/SOURCES/8690145.patch b/SOURCES/8690145.patch deleted file mode 100644 index debcf7f..0000000 --- a/SOURCES/8690145.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8690145a30cb049b0d2bcc9288b388cb9f8bbda7 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: May 19 2023 17:33:11 +0000 -Subject: cargo_license / cargo_license_summary: add "-Z avoid-dev-deps" arg - - -Without this flag, the "cargo tree" command attempts to resolve -dev-dependencies, even though the "no-dev" edge type is specified, -but dev-dependencies might not be present in the environment if the -package is being built with the check %bcond disabled. - ---- - -diff --git a/macros.d/macros.cargo b/macros.d/macros.cargo -index 3785ea0..672ae06 100644 ---- a/macros.d/macros.cargo -+++ b/macros.d/macros.cargo -@@ -183,6 +183,7 @@ fi \ - %cargo_license(naf:)\ - %{shrink:\ - %{__cargo} tree \ -+ -Z avoid-dev-deps \ - --workspace \ - --offline \ - --edges no-build,no-dev,no-proc-macro \ -@@ -204,6 +205,7 @@ fi \ - %cargo_license_summary(naf:)\ - %{shrink:\ - %{__cargo} tree \ -+ -Z avoid-dev-deps \ - --workspace \ - --offline \ - --edges no-build,no-dev,no-proc-macro \ - diff --git a/SOURCES/b9d6410.patch b/SOURCES/b9d6410.patch deleted file mode 100644 index fe591f4..0000000 --- a/SOURCES/b9d6410.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b9d6410bec50c3dfb9433fa5dc51efda1652299b Mon Sep 17 00:00:00 2001 -From: Maxwell G -Date: Mar 09 2023 21:02:01 +0000 -Subject: Correct macro docstring typos - - ---- - -diff --git a/macros.d/macros.rust b/macros.d/macros.rust -index 095cebc..9967804 100644 ---- a/macros.d/macros.rust -+++ b/macros.d/macros.rust -@@ -29,10 +29,10 @@ - # -Copt-level: set optimization level (default: highest optimization level) - # -Cdebuginfo: set debuginfo verbosity (default: full debug information) - # -Ccodegen-units: set number of parallel code generation units (default: 1) --# Cforce-frame-pointers: force inclusion of frame pointers (default: enabled -+# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled - # on x86_64 and aarch64 on Fedora 37+) - # --# Additionally, sime linker flags are set which correspond to the default -+# Additionally, some linker flags are set which correspond to the default - # Fedora compiler flags for hardening and for embedding package versions into - # compiled binaries. - # -