diff --git a/.gitignore b/.gitignore index abd42bb..701e7ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cri-o-0acf849.tar.gz -SOURCES/libpod-0791210.tar.gz +SOURCES/cri-o-e0c89d8.tar.gz +SOURCES/libpod-37a2afe.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 9b7b69b..6d141f1 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,2 +1,2 @@ -7f612a9a7f58bcb91fd3174e074152440d2b5be2 SOURCES/cri-o-0acf849.tar.gz -c3649b5642dd7b8b9e231932fbfcc8de9b27f725 SOURCES/libpod-0791210.tar.gz +5cfbcf5f10f56ed34728dbd8ab801624be8a665d SOURCES/cri-o-e0c89d8.tar.gz +9fb0ee9b0f8945c19a75f4e6c9bd1d78067ed642 SOURCES/libpod-37a2afe.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 4340d9c..5eb58e7 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -14,23 +14,23 @@ %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo libpod # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 07912105635ac54fbf174e394b94899dc23cbf40 +%global commit 37a2afe8728f44f0b311ba26ad7162888fb3e00b %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global import_path_conmon github.com/kubernetes-incubator/cri-o +%global import_path_conmon github.com/kubernetes-sigs/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 0acf849406a02620e13376c4f0902e02e775c21e +%global commit_conmon e0c89d8df1a23b3ff586e5baaa36a396ff4ca571 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.7.3 -Release: 1.git%{shortcommit}%{?dist} +Version: 0.9.2 +Release: 5.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -41,11 +41,8 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar. #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} 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} -%if 0%{?rhel} > 7 -BuildRequires: go-toolset-7-golang-bin -BuildRequires: go-toolset-7-runtime -%endif +#BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: golang %if 0%{?fedora} || 0%{?rhel} <= 7 BuildRequires: btrfs-progs-devel %endif @@ -61,6 +58,7 @@ BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: pkgconfig +BuildRequires: openssl-devel Requires: runc Requires: skopeo-containers >= 0.1.29-3 # can't use default conmon right now, so we ship our own @@ -68,6 +66,7 @@ Requires: skopeo-containers >= 0.1.29-3 Requires: containernetworking-plugins >= 0.7.0-101 Requires: iptables Requires: atomic-registries >= 1.22.1-3 +Requires: container-selinux # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -176,9 +175,7 @@ libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. # Go Toolset -%if 0%{?rhel} > 7 %{?enable_gotoolset7} -%endif %prep %autosetup -Sgit -n %{repo}-%{commit} @@ -195,7 +192,7 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../../ src/%{import_path} popd ln -s vendor src -export GOPATH=%{gopath}:$(pwd)/_build:$(pwd) +export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" GOPATH=$GOPATH go generate ./cmd/%{name}/varlink/... @@ -207,18 +204,23 @@ make GOPATH=%{buildroot} docs pushd cri-o-%{commit_conmon} mkdir _output pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" make BUILDTAGS="$BUILDTAGS" GOPATH=$GOPATH bin/conmon popd %install -%make_install PREFIX=%{buildroot}%{_prefix} install install.completions +%{__make} PREFIX=%{buildroot}%{_usr} ETCDIR=%{buildroot}%{_sysconfdir} \ + install.bin \ + install.man \ + install.cni \ + install.systemd \ + install.completions # install libpod.conf install -dp %{buildroot}%{_datadir}/containers @@ -256,11 +258,39 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf -%{_unitdir}/io.%{project}.%{name}.service -%{_unitdir}/io.%{project}.%{name}.socket %{_prefix}/lib/tmpfiles.d/%{name}.conf +%{_unitdir}/io.%{name}.service +%{_unitdir}/io.%{name}.socket %changelog +* Mon Sep 17 2018 Frantisek Kluknavsky - 0.9.2-5.git37a2afe +- rebase to podman 0.9.2 +- rebase to cri-o 0.11.4 + +* Fri Sep 14 2018 dwalsh - 0.9.1-4.gitaba58d1 +- podman no longer requires oci-systemd-hook + +* Sun Sep 09 2018 baude - 0.9.1-3.gitaba58d1 +- Grab correct commit for podman-0.9.1 + +* Wed Sep 05 2018 Frantisek Kluknavsky - 0.8.5-3.gitdc5a711 +- rebased cri-o to 1.11.2 + +* Tue Sep 04 2018 Frantisek Kluknavsky - 0.8.5-2.gitdc5a711 +- rebase + +* Tue Sep 04 2018 Frantisek Kluknavsky - 0.8.4-3.git9f9b8cf +- depend on oci-systemd-hook + +* Thu Aug 30 2018 Frantisek Kluknavsky - 0.8.4-2.git9f9b8cf +- rebase + +* Sun Aug 12 2018 Dan Walsh - 0.8.2.1-1.git7a526bb +- Upstream 0.8.2.1 release + +* Sat Aug 4 2018 Dan Walsh - 0.8.1-1.git6b4ab2a +- Bump to v0.8.1 + * Sat Jul 21 2018 Dan Walsh - 0.7.3-2.git079121 - Turn on ostree support - Upstream 0.7.3