rpms/rpm-ostree
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Sync spec file with upstream

Browse Source
This commit is contained in:
Colin Walters 2021-01-19 15:22:15 +00:00
parent 2916123c26
commit 2a00094320
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpm-ostree.spec
View File

@ -8,15 +8,15 @@ Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/coreos/rpm-ostree URL: https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
# in the upstream git. If rust is enabled, it contains vendored sources. # 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 Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
BuildRequires: make
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel} && !0%{?eln}
BuildRequires: rust-toolset BuildRequires: rust-toolset
%else %else
BuildRequires: rust-packaging
BuildRequires: cargo BuildRequires: cargo
BuildRequires: rust BuildRequires: rust
%endif %endif
@ -30,6 +30,10 @@ BuildRequires: rust
%bcond_without zchunk %bcond_without zchunk
%endif %endif
%if 0%{?fedora} >= 34
%define sqlite_rpmdb_default "--enable-sqlite-rpmdb-default"
%endif
# For the autofiles bits below # For the autofiles bits below
BuildRequires: /usr/bin/python3 BuildRequires: /usr/bin/python3
# We always run autogen.sh # We always run autogen.sh
@ -37,12 +41,11 @@ BuildRequires: autoconf automake libtool git
# For docs # For docs
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: gperf
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: /usr/bin/g-ir-scanner BuildRequires: /usr/bin/g-ir-scanner
# Core requirements # 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) # 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) >= 2019.2 BuildRequires: pkgconfig(ostree-1) >= 2020.7
BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(rpm)
@ -130,8 +133,11 @@ The %{name}-devel package includes the header files for %{name}-libs.
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
env NOCONFIGURE=1 ./autogen.sh 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
export RUSTFLAGS="%{build_rustflags}" export RUSTFLAGS="%{build_rustflags}"
%configure --disable-silent-rules --enable-gtk-doc %configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default}
%make_build %make_build
%install %install