File rust2rpm-python36-v21.patch of Package rust-packaging

Overview Repositories Revisions Requests Users Attributes Meta

File rust2rpm-python36-v21.patch of Package rust-packaging

diff -urN rust2rpm-v21/data/macros.cargo rust2rpm-v21-patch/data/macros.cargo
--- rust2rpm-v21/data/macros.cargo	2022-02-20 17:11:15.000000000 +0200
+++ rust2rpm-v21-patch/data/macros.cargo	2023-03-22 11:14:49.557678213 +0200
@@ -4,8 +4,8 @@
 # it never writes to ~/.cargo during rpmbuild.
 # We also need RUSTC_BOOTSTRAP since we use -Z avoid-dev-deps
 # until it gets stabilized: https://github.com/rust-lang/cargo/issues/5133
-%__cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' %{_bindir}/cargo
-%__cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps
+%__cargo CARGO_HOME=.cargo %{_bindir}/cargo
+%__cargo_common_opts %{?_smp_mflags}
 %__cargo_inspector %{_bindir}/cargo-inspector
 
 %cargo_registry %{_datadir}/cargo/registry
@@ -27,6 +27,7 @@
 CFLAGS = "%{build_cflags}"\
 CXXFLAGS = "%{build_cxxflags}"\
 LDFLAGS = "%{build_ldflags}"\
+RUSTFLAGS="%{build_rustflags}"\
 \
 [install]\
 root = "%{buildroot}%{_prefix}"\
@@ -36,12 +37,11 @@
 \
 [source]\
 \
-[source.local-registry]\
-directory = "%{cargo_registry}"\
-\
 [source.crates-io]\
-registry = "https://crates.io"\
-replace-with = "local-registry"\
+replace-with = "vendored-sources"\
+\
+[source.vendored-sources]\
+directory = "vendor"\
 EOF\
 %{__rm} -f Cargo.lock \
 )
@@ -55,29 +55,16 @@
 }
 
 %cargo_generate_buildrequires(af:) \
-%{__cargo_inspector} -BR %{__cargo_parse_opts %{-a} %{-f:-f%{-f*}}} Cargo.toml \
+%{__cargo_inspector} -BR Cargo.toml \
 %if %{with check} \
   %{__cargo_inspector} -TR Cargo.toml \
 %endif
 
 %cargo_build(naf:) \
-%{shrink:\
-  %{__cargo} build                                   \
-    %{__cargo_common_opts}                           \
-    --release                                        \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
-    %*                                               \
-}
+%{__cargo} build %{__cargo_common_opts} --release  %*
 
 %cargo_test(naf:) \
-%{shrink:\
-  %{__cargo} test                                    \
-    %{__cargo_common_opts}                           \
-    --release                                        \
-    --no-fail-fast                                   \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
-    %*                                               \
-}
+%{__cargo} test %{__cargo_common_opts} --release --no-fail-fast %*
 
 %cargo_install(t:naf:) (                                            \
 set -eu                                                             \
@@ -97,15 +84,12 @@
   echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json  \
 fi                                                                  \
 if %__cargo_is_bin; then                                            \
-  %{shrink:                                                         \
-    %{__cargo} install                                              \
-      %{__cargo_common_opts}                                        \
-      --no-track                                                    \
-      --path .                                                      \
-      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
-      %*                                                            \
-  }                                                                 \
-fi                                                                  \
+  %{__cargo} install                                              \
+    %{__cargo_common_opts}                                        \
+    --no-track                                                    \
+    --path .                                                      \
+    %*                                                            \
+fi                                                                \
 )
 
 %__cargo_feature_from_name(n:) %{lua:
diff -urN rust2rpm-v21/data/macros.rust rust2rpm-v21-patch/data/macros.rust
--- rust2rpm-v21/data/macros.rust	2022-02-20 17:11:15.000000000 +0200
+++ rust2rpm-v21-patch/data/macros.rust	2023-03-21 08:38:29.610359863 +0200
@@ -2,15 +2,13 @@
 %__rustdoc %{_bindir}/rustdoc
 
 # Enable optimization, debuginfo, and link hardening.
-%build_rustflags %{shrink:
-  -Copt-level=3
+%build_rustflags -Copt-level=3
   -Cdebuginfo=2
   -Clink-arg=-Wl,-z,relro
   -Clink-arg=-Wl,-z,now
   %{?_package_note_file:-Clink-arg=-Wl,-dT,%{_package_note_file}}
   -Ccodegen-units=1
   --cap-lints=warn
-}
 
 %__global_rustflags %{build_rustflags}
 
diff -urN rust2rpm-v21/rust2rpm/metadata.py rust2rpm-v21-patch/rust2rpm/metadata.py
--- rust2rpm-v21/rust2rpm/metadata.py	2022-02-20 17:11:15.000000000 +0200
+++ rust2rpm-v21-patch/rust2rpm/metadata.py	2023-03-20 12:47:26.249610103 +0200
@@ -382,12 +382,10 @@
 
     @staticmethod
     def manifest(path, check=True):
-        output = subprocess.run(
-            ["cargo", "read-manifest", f"--manifest-path={path}"],
-            check=check, capture_output=True
-        )
+        output = subprocess.check_output(
+            ["cargo", "read-manifest", f"--manifest-path={path}"])
         try:
-            result = json.loads(output.stdout)
+            result = json.loads(output)
         except json.decoder.JSONDecodeError:
             # Pure virtual manifest cannot be read, we need to use one
             # from the different workspaces

Places

File rust2rpm-python36-v21.patch of Package rust-packaging

Places