-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
packaging/rpm-ostree.spec: Update to sync with rawhide
The specs between upstream, fedora and centos are out of sync. This attempts to sync it to restart using it as the source of truth.
- Loading branch information
Showing
1 changed file
with
10 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
Summary: Hybrid image/package system | ||
Name: rpm-ostree | ||
Version: 2024.7 | ||
Release: 1%{?dist} | ||
Release: %autorelease | ||
License: LGPL-2.0-or-later | ||
URL: https://github.com/coreos/rpm-ostree | ||
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" | ||
|
@@ -13,8 +13,14 @@ Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm- | |
|
||
ExclusiveArch: %{rust_arches} | ||
|
||
# ostree not on i686 for RHEL 10 | ||
# https://github.com/containers/composefs/pull/229#issuecomment-1838735764 | ||
%if 0%{?rhel} >= 10 | ||
ExcludeArch: %{ix86} | ||
%endif | ||
|
||
BuildRequires: make | ||
%if 0%{?rhel} && !0%{?eln} | ||
%if 0%{?rhel} | ||
BuildRequires: rust-toolset | ||
%else | ||
BuildRequires: rust-packaging | ||
|
@@ -132,12 +138,10 @@ Requires: librepo%{?_isa} >= %{librepo_version} | |
# rpm-ostree wraps more of ostree (such as `ostree admin unlock` etc.) | ||
Requires: ostree | ||
Requires: bubblewrap | ||
Requires: fuse | ||
|
||
# For container functionality | ||
# https://github.com/coreos/rpm-ostree/issues/3286 | ||
Requires: skopeo | ||
Requires: /usr/bin/setpriv | ||
|
||
Requires: %{name}-libs%{?_isa} = %{version}-%{release} | ||
|
||
|
@@ -163,7 +167,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} | |
The %{name}-devel package includes the header files for %{name}-libs. | ||
|
||
%prep | ||
%autosetup -Sgit -n %{name}-%{version} | ||
%autosetup -Sgit -n %{name}-%{version} -p1 | ||
%if 0%{?__isa_bits} == 32 | ||
sed -ie 's,^lto = true,lto = false,' Cargo.toml | ||
%endif | ||
|
@@ -268,5 +272,4 @@ fi | |
%files devel -f files.devel | ||
|
||
%changelog | ||
* Thu Nov 17 2022 Colin Walters <[email protected]> - 2022.15-3 | ||
- Dummy change to satisfy rpm timestamp clamping | ||
%autochangelog |