Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containers/skopeo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0b9d2bf40ac795c8ca9cf01a908878d07783d02
Choose a base ref
..
head repository: containers/skopeo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16655f4b44f445fa39e68ea0a36af6b11c77b848
Choose a head ref
Showing with 12 additions and 0 deletions.
  1. +12 −0 rpm/skopeo.spec
12 changes: 12 additions & 0 deletions rpm/skopeo.spec
Original file line number Diff line number Diff line change
@@ -14,6 +14,10 @@
%define build_with_btrfs 1
%endif

%if %{defined rhel}
%define fips 1
%endif

# Only used in official koji builds
# Copr builds set a separate epoch for all environments
%if %{defined fedora}
@@ -121,6 +125,10 @@ export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_tag.sh) $(hack/btrfs_installed_tag
export BUILDTAGS="$BASEBUILDTAGS btrfs_noversion exclude_graphdriver_btrfs"
%endif

%if %{defined fips}
export BUILDTAGS="$BUILDTAGS libtrust_openssl"
%endif

# unset LDFLAGS earlier set from set_build_flags
LDFLAGS=''

@@ -140,6 +148,10 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
#define license tag if not already defined
%{!?_licensedir:%global license %doc}

# Include this to silence rpmlint.
# Especially annoying if you use syntastic vim plugin.
%check

%files
%license LICENSE
%doc README.md