From 3dc734edb8be2ed30ebee2b8ba0def69ff410a76 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 31 2019 18:58:10 +0000 Subject: import buildah-1.5-2.gite94b4f9.el7 --- diff --git a/.buildah.metadata b/.buildah.metadata index 8139b39..b4e4c93 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -d9c7528cbe0043e181153eac9b0d22569212e0c6 SOURCES/buildah-c8ed967.tar.gz +d3fcf1950a92f35210dc390cde164f6e428826d1 SOURCES/buildah-e94b4f9.tar.gz diff --git a/.gitignore b/.gitignore index ac2a2f9..875c12c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/buildah-c8ed967.tar.gz +SOURCES/buildah-e94b4f9.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index 282b180..9cbf305 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -21,22 +21,22 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit c8ed967f3ede19485883bdf4498727bec2b0961a +%global commit e94b4f98048e7371685731b97eefd6265e2f1fb3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 1.4 -Release: 3.git%{shortcommit}%{?dist} +Version: 1.5 +Release: 2.git%{shortcommit}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -#BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: go-toolset-7-runtime -BuildRequires: go-toolset-7-golang-bin -BuildRequires: openssl-devel +%if 0%{?fedora} || 0%{?centos} +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%else +BuildRequires: go-toolset-1.10 +%endif #fedora BuildRequires: git BuildRequires: glib2-devel BuildRequires: ostree-devel @@ -61,7 +61,7 @@ or * save container's root file system layer to create a new image * delete a working container or an image -%enable_gotoolset7 +%{?enable_gotoolset110} %prep %autosetup -Sgit -n %{name}-%{commit} @@ -96,6 +96,15 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Dec 10 2018 Frantisek Kluknavsky - 1.5-2.gite94b4f9 +- go toolset 1.10 + +* Thu Nov 22 2018 Dan Walsh - 1.5-1.gite94b4f98 +- bump to v1.5 Release + +* Thu Nov 08 2018 Frantisek Kluknavsky - 1.4-4.gitc8ed967 +- buildrequires for centos + * Tue Nov 06 2018 Frantisek Kluknavsky - 1.4-3.gitc8ed967 - rebase