From 41d9f72eceefb791d44cbeb937dd6d02620b2116 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 19 Jul 2021 09:59:09 -0400 Subject: [PATCH] New release v2021.7 https://github.com/coreos/rpm-ostree/releases/tag/v2021.7 --- .gitignore | 1 + import-spec | 2 +- rpm-ostree.spec | 72 ++++++++++++++++++++++++++++++++----------------- sources | 2 +- 4 files changed, 50 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index fa1e048..d3110f5 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /rpm-ostree-2021.4.tar.xz /rpm-ostree-2021.5.tar.xz /rpm-ostree-2021.6.tar.xz +/rpm-ostree-2021.7.tar.xz diff --git a/import-spec b/import-spec index 53de1f3..ad1ca4b 100755 --- a/import-spec +++ b/import-spec @@ -22,7 +22,7 @@ done main() { local upstream upstream=$(get_parsed_spec_field URL) - curl -Lo rpm-ostree.spec.new "$upstream/raw/master/packaging/rpm-ostree.spec.in" + curl -Lo rpm-ostree.spec.new "$upstream/raw/main/packaging/rpm-ostree.spec.in" sed -ne '/%changelog/,$ p' rpm-ostree.spec >> rpm-ostree.spec.new if [ -n "${KEEP_V_R}" ]; then diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 0cbf8ea..ce07354 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,8 +3,8 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2021.6 -Release: 3%{?dist} +Version: 2021.7 +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" @@ -27,15 +27,20 @@ BuildRequires: rust # 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. +# sync, and today we bundle libdnf but not librepo. Also +# flip the rpmdb default to be bdb. %if 0%{?rhel} && 0%{?rhel} <= 8 %bcond_with zchunk +%define rpmdb_default "--enable-bdb-rpmdb-default" %else %bcond_without zchunk %endif -%if 0%{?fedora} >= 34 -%define sqlite_rpmdb_default "--enable-sqlite-rpmdb-default" +# See https://fedoraproject.org/wiki/Changes/Sqlite_Rpmdb +# https://bugzilla.redhat.com/show_bug.cgi?id=1938928 +# https://github.com/openshift/os/issues/552 +%if 0%{?fedora} <= 33 +%define rpmdb_default "--enable-bdb-rpmdb-default" %endif # For the autofiles bits below @@ -49,10 +54,10 @@ BuildRequires: gnome-common BuildRequires: /usr/bin/g-ir-scanner # Core requirements # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members) -BuildRequires: pkgconfig(ostree-1) >= 2020.7 +BuildRequires: pkgconfig(ostree-1) >= 2021.1 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(rpm) >= 4.16.0 +BuildRequires: pkgconfig(rpm) >= 4.14.0 BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libsystemd) BuildRequires: libcap-devel @@ -73,33 +78,47 @@ BuildRequires: pkgconfig(check) # but duplicating to be clear) BuildRequires: pkgconfig(libsolv) -# We need g++ for libdnf -BuildRequires: gcc-c++ +######################################################################### +# libdnf build deps # +# # +# Copy/pasted from libdnf/libdnf.spec. Removed the irrelevant bits like # +# valgrind, rhsm, swig, python, and sanitizer stuff. # +######################################################################### -# 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 -BuildRequires: swig >= %{swig_version} -BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version} -BuildRequires: pkgconfig(librepo) >= %{librepo_version} +%global librepo_version 1.13.1 + +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: libsolv-devel >= %{libsolv_version} -BuildRequires: pkgconfig(json-c) -BuildRequires: pkgconfig(cppunit) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(smartcols) +BuildRequires: pkgconfig(librepo) >= %{librepo_version} +BuildRequires: pkgconfig(check) +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0 +BuildRequires: pkgconfig(gtk-doc) +BuildRequires: rpm-devel >= 4.11.0 %if %{with zchunk} BuildRequires: pkgconfig(zck) >= 0.9.11 %endif +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(cppunit) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(modulemd-2.0) >= %{libmodulemd_version} +BuildRequires: pkgconfig(smartcols) +BuildRequires: gettext BuildRequires: gpgme-devel -# Runtime libdnf deps Requires: libmodulemd%{?_isa} >= %{libmodulemd_version} Requires: libsolv%{?_isa} >= %{libsolv_version} Requires: librepo%{?_isa} >= %{librepo_version} +######################################################################### +# end of libdnf build deps # +######################################################################### + # For now...see https://github.com/projectatomic/rpm-ostree/pull/637 # and https://github.com/fedora-infra/fedmsg-atomic-composer/pull/17 # etc. We'll drop this dependency at some point in the future when @@ -133,10 +152,8 @@ The %{name}-devel package includes the header files for %{name}-libs. %prep %autosetup -Sgit -n %{name}-%{version} -# 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 +sed -ie 's,^lto = true,lto = false,' Cargo.toml %endif %build @@ -144,8 +161,10 @@ 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 +%if 0%{?build_rustflags:1} export RUSTFLAGS="%{build_rustflags}" -%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers} +%endif +%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers} %make_build @@ -209,8 +228,11 @@ $PYTHON autofiles.py > files.devel \ %files libs -f files.lib %files devel -f files.devel - %changelog +* Mon Jul 19 2021 Jonathan Lebon - 2021.7-1 +- New release v2021.7 + https://github.com/coreos/rpm-ostree/releases/tag/v2021.7 + * Sat Jul 10 2021 Björn Esser - 2021.6-3 - Rebuild for versioned symbols in json-c diff --git a/sources b/sources index cc4b5f3..1fcbbc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2021.6.tar.xz) = 3e87b16d551a3364bd72ea85261cdb13cdab40f08b8513e0ee4a226730febf9117c1ff37230e30eac8d10694631adde513f9070031a929ed4c65cca6defc0f97 +SHA512 (rpm-ostree-2021.7.tar.xz) = 9333ceed2df8f5a298b709313bb54f96fe3fb816ee28e1e23ac3b623fb6b85b28826554f77cbb535edd5487098ca32ce2f1f53c3164668524c138929c185df44