diff --git a/.gitignore b/.gitignore index 17ce42c..7b2950e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /src_vipa-*.tar.gz /s390-tools-*.tar.bz2 /s390-tools-*.tar.gz +/s390-tools-2.29.0-rust-vendor.tar.xz diff --git a/s390utils.spec b/s390utils.spec index 7940454..8e6c4a3 100644 --- a/s390utils.spec +++ b/s390utils.spec @@ -25,6 +25,11 @@ ExclusiveArch: s390 s390x #URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html URL: https://github.com/ibm-s390-tools/s390-tools Source0: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz +# To create the vendor tarball: +# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust/pvsecret ; \ +# rm -f Cargo.lock && cargo vendor && \ +# tar Jvcf ../../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd +Source1: s390-tools-%{version}-rust-vendor.tar.xz Source4: http://www.linuxvm.org/Patches/S390/cmsfs-%{cmsfsver}.tar.gz Source5: zfcpconf.sh # http://www.ibm.com/developerworks/linux/linux390/src_vipa-%%{vipaver}.html @@ -72,6 +77,11 @@ Requires: s390utils-cmsfs = %{epoch}:%{version}-%{release} BuildRequires: gcc-c++ %if %{with rust} +%if 0%{?rhel} +BuildRequires: libcurl-devel +BuildRequires: openssl-devel +BuildRequires: rust-toolset +%else BuildRequires: crate(anstream) BuildRequires: crate(anstyle-query) BuildRequires: crate(anyhow) @@ -96,6 +106,7 @@ BuildRequires: crate(thiserror) BuildRequires: crate(zerocopy) BuildRequires: rust-packaging %endif +%endif %description This is a meta package for installing the default s390-tools sub packages. @@ -144,7 +155,13 @@ popd find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g' %if %{with rust} +%if 0%{?rhel} +pushd rust +%cargo_prep -V 1 +popd +%else %cargo_prep +%endif rm -rf ./rust/pvsecret/Cargo.lock %endif diff --git a/sources b/sources index fca21b9..0d88496 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (cmsfs-1.1.8c.tar.gz) = 2ba5687d378fdd9871283728e81f1399047e74f9bba3936726eda11a978fe6ced1a300f15acb871d5daa26e61069d89767c753cf584f2731f5e99985db96aef0 SHA512 (src_vipa-2.1.0.tar.gz) = 8f6048e82b4bcc479dfb09d62da64b9519f66efc31889ff795ee6ca107e262167df57628c305f1b899c41bb3f035e6309552d8548c890855d319e8e60d6a6cf7 SHA512 (s390-tools-2.29.0.tar.gz) = 3eeaab0e0c6559b9fb0b4c7cca49358a7cc7fe0cb11684d2d761fe105cc2bfd791d33ecc2070e3dfd877039b68e868699cd3cea318e64aee1cc0f348c7b41617 +SHA512 (s390-tools-2.29.0-rust-vendor.tar.xz) = 7ee717c5848e7b59c3e11ef6b461122e5f1195e67d11e378352b297926b498180222bfc23719d952fb11677a3fd440d299e0035ca6ab0c6d784573e9a5698594