diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 22dd604..99a145b 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,18 +3,13 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2021.5 -Release: 3%{?dist} +Version: 2021.6 +Release: 1%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. It also contains vendored Rust sources. Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz -# Initial support for OpenSSL 3.0.0-alpha16 -# https://github.com/sfackler/rust-openssl/pull/1264 -%global rust_openssl_commit 770ba32702abd2b4cab80727958c27ac3043c3ec -%global rust_openssl rust-openssl-%{rust_openssl_commit} -Source103: https://github.com/sfackler/rust-openssl/archive/%{rust_openssl_commit}/%{rust_openssl}.tar.gz ExclusiveArch: %{rust_arches} @@ -138,11 +133,11 @@ The %{name}-devel package includes the header files for %{name}-libs. %prep %autosetup -Sgit -n %{name}-%{version} -rm -rf vendor/openssl{,-sys,-errors}/* -tar -xf %{SOURCE103} -C vendor/ --strip-components=1 %{rust_openssl}/openssl{,-sys}/ -# https://blogs.gnome.org/mcatanzaro/2020/05/18/patching-vendored-rust-dependencies/ -echo '{"files": {}, "package": "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"}' > vendor/openssl/.cargo-checksum.json -echo '{"files": {}, "package": "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"}' > vendor/openssl-sys/.cargo-checksum.json +# We hit "LLVM ERROR: out of memory" with LTO on 32 bit +# https://bugzilla.redhat.com/show_bug.cgi?id=1974927 +%if 0%{?__isa_bits} == 32 +sed -ie 's,^lto = true,# disabled: lto = true,' Cargo.toml +%endif %build env NOCONFIGURE=1 ./autogen.sh @@ -218,6 +213,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Tue Jun 22 2021 Colin Walters +- https://github.com/coreos/rpm-ostree/releases/tag/v2021.6 + * Wed Jun 16 2021 Mohan Boddu - 2021.5-3 - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065