Skip to content

Commit

Permalink
spec: Add version conditionals
Browse files Browse the repository at this point in the history
This should fix containers/bootc#1033
by ensuring the copr builds use the same logic.

(It's so annoying that we have default branching on packages,
 but keeping them in sync is so annoying in general that
 we end up merging, which defeats the reason for having branches
 at all, and so we end up with these version conditionals anyways)
  • Loading branch information
cgwalters committed Jan 20, 2025
1 parent c424510 commit fbdd6c0
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions packaging/rpm-ostree.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ BuildRequires: rust
%bcond_with sanitizers
# Embedded unit tests
%bcond_with bin_unit_tests
# Don't add the ostree-container binaries
%bcond_without ostree_ext

# Don't add the ostree-container binaries; this version
# conditional needs to be kept in sync with the bootc one.
%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
%bcond_with ostree_ext
%else
%bcond_without ostree_ext
%endif

# This is copied from the libdnf spec
%if 0%{?rhel} && ! 0%{?centos}
Expand Down

0 comments on commit fbdd6c0

Please sign in to comment.