From f2ee207ad9c5e6ec1d839173d36833832dd8d53d Mon Sep 17 00:00:00 2001 From: Luca BRUNO Date: Thu, 27 May 2021 08:11:02 +0000 Subject: [PATCH] spec: new upstream version 2021.5 Resolves: rhbz#1961324 --- .gitignore | 1 + rpm-ostree.spec | 69 +++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 49 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index dfcd6c7..a1d2df2 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ /rpm-ostree-2020.10.tar.xz /rpm-ostree-2021.1.tar.xz /rpm-ostree-2021.2.tar.xz +/rpm-ostree-2021.5.tar.xz diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 4d43f81..b250314 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -1,10 +1,10 @@ # The canonical copy of this spec file is upstream at: -# https://github.com/coreos/rpm-ostree/blob/master/packaging/rpm-ostree.spec.in +# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in Summary: Hybrid image/package system Name: rpm-ostree -Version: 2021.2 -Release: 3%{?dist} +Version: 2021.5 +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" @@ -13,6 +13,7 @@ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm- ExclusiveArch: %{rust_arches} +BuildRequires: make %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset %else @@ -21,6 +22,9 @@ BuildRequires: cargo BuildRequires: rust %endif +# Enable ASAN + UBSAN +%bcond_with sanitizers + # RHEL8 doesn't ship zchunk today. See also the comments # in configure.ac around this as libdnf/librepo need to be in # sync, and today we bundle libdnf but not librepo. @@ -48,39 +52,40 @@ BuildRequires: /usr/bin/g-ir-scanner BuildRequires: pkgconfig(ostree-1) >= 2020.7 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(rpm) +BuildRequires: pkgconfig(rpm) >= 4.16.0 BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libsystemd) BuildRequires: libcap-devel BuildRequires: libattr-devel -# We currently interact directly with librepo +# We currently interact directly with librepo (libdnf below also pulls it in, +# but duplicating to be clear) BuildRequires: pkgconfig(librepo) # Needed by curl-rust BuildRequires: pkgconfig(libcurl) -# libdnf bundling -# We're using RPATH to pick up our bundled version -%global __requires_exclude ^libdnf[.]so[.].*$ - -# Our bundled libdnf.so.2 is for us only -%global __provides_exclude_from ^%{_libdir}/%{name}/.*$ - BuildRequires: cmake BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(check) + +# We use some libsolv types directly too (libdnf below also pulls it in, +# but duplicating to be clear) BuildRequires: pkgconfig(libsolv) # We need g++ for libdnf BuildRequires: gcc-c++ -# more libdnf build deps (see libdnf's spec for versions) +# more libdnf build deps (see libdnf's spec for versions; maintain ordering) +%global libsolv_version 0.7.17 +%global libmodulemd_version 2.11.2-2 +%global librepo_version 1.13.0 %global swig_version 3.0.12 -%global libmodulemd_version 2.5.0 BuildRequires: swig >= %{swig_version} BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version} +BuildRequires: pkgconfig(librepo) >= %{librepo_version} +BuildRequires: libsolv-devel >= %{libsolv_version} BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(sqlite3) @@ -90,7 +95,10 @@ BuildRequires: pkgconfig(zck) >= 0.9.11 %endif BuildRequires: gpgme-devel +# Runtime libdnf deps Requires: libmodulemd%{?_isa} >= %{libmodulemd_version} +Requires: libsolv%{?_isa} >= %{libsolv_version} +Requires: librepo%{?_isa} >= %{librepo_version} # For now...see https://github.com/projectatomic/rpm-ostree/pull/637 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17 @@ -127,18 +135,15 @@ The %{name}-devel package includes the header files for %{name}-libs. %autosetup -Sgit -n %{name}-%{version} %build -# gobject introspection does not work with LTO. There is an effort to fix this -# in the appropriate project upstreams, so hopefully LTO can be enabled someday -# Disable LTO. -%define _lto_cflags %{nil} - env NOCONFIGURE=1 ./autogen.sh # Since we're hybrid C++/Rust we need to propagate this manually; # the %%configure macro today assumes (reasonably) that one is building # C/C++ and sets C{,XX}FLAGS -# FIXME: Disable this for now -#export RUSTFLAGS="%{build_rustflags}" -%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} +%if 0%{?build_rustflags:1} +export RUSTFLAGS="%{build_rustflags}" +%endif +%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers} + %make_build %install @@ -201,10 +206,30 @@ $PYTHON autofiles.py > files.devel \ %files libs -f files.lib %files devel -f files.devel + %changelog +* Wed May 12 2021 Luca BRUNO - 2021.5-1 +- New upstream version + https://github.com/coreos/rpm-ostree/releases/tag/v2021.5 + +* Sun May 09 2021 Jeff Law - 2021.4-4 +- Re-enable LTO + +* Wed Apr 28 2021 Colin Walters - 2021.4-3 +- Backport another patch for https://pagure.io/fedora-infrastructure/issue/9909 + +* Tue Apr 27 2021 Colin Walters - 2021.4-2 +- Backport patch for https://pagure.io/fedora-infrastructure/issue/9909 + * Fri Apr 16 2021 Mohan Boddu - 2021.2-3 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Mon Apr 12 2021 Jonathan Lebon - 2021.4-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2021.4 + +* Wed Mar 17 2021 Colin Walters - 2021.3-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2021.3 + * Wed Feb 17 2021 Colin Walters - 2021.2-2 - https://github.com/coreos/rpm-ostree/releases/tag/v2021.2 diff --git a/sources b/sources index be1be5f..9465cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2021.2.tar.xz) = 34dcbf56ba063de1dca880c85da801f36c9f603504a123760fc3b6ad525b4bbf3e997c6edd5d77c080f4bf86fc8504fe76a1ddd345d7b95ab81fdda3ea264e6d +SHA512 (rpm-ostree-2021.5.tar.xz) = f7802e15110255ba450ce03802552f517f7e235be46ada4229ec3904c63e741f23964802c67598ec7cedb05322b4c6f31e026336fe3ae5ef5ff3c60f68ce6810