Skip to content

Commit

Permalink
Merge pull request #4964 from lsm5/main-packit
Browse files Browse the repository at this point in the history
[CI:BUILD] Packit: add fedora-eln targets and build docs with vendored go-md2man
  • Loading branch information
openshift-merge-robot committed Aug 10, 2023
2 parents bc68b59 + 9ab3b52 commit 3ec3ecc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .packit.yaml
Expand Up @@ -16,6 +16,8 @@ jobs:
targets:
- fedora-all-x86_64
- fedora-all-aarch64
- fedora-eln-x86_64
- fedora-eln-aarch64
- centos-stream+epel-next-8-x86_64
- centos-stream+epel-next-8-aarch64
- centos-stream+epel-next-9-x86_64
Expand Down
7 changes: 3 additions & 4 deletions rpm/buildah.spec
Expand Up @@ -47,7 +47,6 @@ Summary: A command line tool used for creating OCI Images
URL: https://%{name}.io
# Tarball fetched from upstream
Source: %{git0}/archive/v%{version}.tar.gz
BuildRequires: %{_bindir}/go-md2man
BuildRequires: device-mapper-devel
BuildRequires: git-core
BuildRequires: golang >= 1.16.6
Expand Down Expand Up @@ -129,19 +128,19 @@ export BUILDTAGS+=' btrfs_noversion exclude_graphdriver_btrfs'
%gobuild -o bin/imgtype ./tests/imgtype
%gobuild -o bin/copy ./tests/copy
%gobuild -o bin/tutorial ./tests/tutorial
GOMD2MAN=go-md2man %{__make} -C docs
%{__make} docs

%install
export GOPATH=$(pwd)/_build:$(pwd)
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install

install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial

rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*

#define license tag if not already defined
%{!?_licensedir:%global license %doc}

Expand Down

0 comments on commit 3ec3ecc

Please sign in to comment.