rpms/buildah
5
0
Fork 0
Code Issues Pull Requests Releases Activity

bump to v1.24.0, bump containers-common dep

Browse Source 
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-01-28 14:08:14 -05:00
parent 56f7ebbada
commit 68c8edb3a5
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
buildah.spec
View File

@ -1,10 +1,4 @@
%global with_bundled 1
%if 0%{?fedora}
%global with_debug 1 %global with_debug 1
%else
%global with_debug 0
%endif
%if 0%{?with_debug} %if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil} %global _find_debuginfo_dwz_opts %{nil}
@ -13,10 +7,6 @@
%global debug_package %{nil} %global debug_package %{nil}
%endif %endif
%if ! 0%{?gobuild:1}
%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
%endif
%global provider github %global provider github
%global provider_tld com %global provider_tld com
%global project containers %global project containers
@ -25,7 +15,7 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
%global git0 https://%{import_path} %global git0 https://%{import_path}
%global built_tag v1.23.2 %global built_tag v1.24.0
%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) %global built_tag_strip %(b=%{built_tag}; echo ${b:1})
%global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"}) %global gen_version %(b=%{built_tag_strip}; echo ${b/-/"~"})
@ -38,7 +28,6 @@ URL: https://%{name}.io
Source: %{git0}/archive/%{built_tag}.tar.gz Source: %{git0}/archive/%{built_tag}.tar.gz
BuildRequires: device-mapper-devel BuildRequires: device-mapper-devel
BuildRequires: golang >= 1.16.6 BuildRequires: golang >= 1.16.6
BuildRequires: git
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: glibc-static BuildRequires: glibc-static
BuildRequires: go-md2man BuildRequires: go-md2man
@ -51,7 +40,7 @@ BuildRequires: ostree-devel
%if 0%{?fedora} && ! 0%{?eln} %if 0%{?fedora} && ! 0%{?eln}
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
%endif %endif
Requires: containers-common >= 4:1-17 Requires: containers-common >= 4:1-46
BuildRequires: libseccomp-static BuildRequires: libseccomp-static
Requires: libseccomp >= 2.4.1-0 Requires: libseccomp >= 2.4.1-0
Suggests: cpp Suggests: cpp
@ -123,7 +112,7 @@ Requires: nmap-ncat
This package contains system tests for %{name} This package contains system tests for %{name}
%prep %prep
%autosetup -Sgit -n %{name}-%{built_tag_strip} %autosetup -n %{name}-%{built_tag_strip}
%build %build
%set_build_flags %set_build_flags
@ -150,14 +139,12 @@ export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.tx
export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
export BUILDTAGS='seccomp selinux' export BUILDTAGS='seccomp selinux'
%if 0%{?centos} >= 8
export BUILDTAGS+=' exclude_graphdriver_btrfs'
%endif
%gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o bin/imgtype %{import_path}/tests/imgtype %gobuild -o bin/imgtype %{import_path}/tests/imgtype
%gobuild -o bin/copy %{import_path}/tests/copy %gobuild -o bin/copy %{import_path}/tests/copy
GOMD2MAN=go-md2man %{__make} -C docs GOMD2MAN=go-md2man %{__make} -C docs
%install %install
export GOPATH=$(pwd)/_build:$(pwd):%{gopath} export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
@ -168,6 +155,8 @@ cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
rm %{buildroot}%{_mandir}/man5/{Containerfile.5*,containerignore.5*}
#define license tag if not already defined #define license tag if not already defined
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}