diff --git a/podman.spec b/podman.spec index b75eb92..2a76563 100644 --- a/podman.spec +++ b/podman.spec @@ -40,51 +40,57 @@ %define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; #% endif -%global provider github -%global provider_tld com -%global project projectatomic -%global repo libpod +%global provider github +%global provider_tld com +%global project projectatomic +%global repo libpod # https://github.com/projectatomic/libpod %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 72c0b4f1e2a4a4ceb629e65837f2efe6496c387d -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - -Name: podman -Version: 0.6.2 -Release: 9.git%{shortcommit0}%{?dist} -Summary: Manage Pods, Containers and Container Images -License: ASL 2.0 -URL: %{git_podman} -Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +%global import_path %{provider_prefix} +%global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} +%global commit 72c0b4f1e2a4a4ceb629e65837f2efe6496c387d +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +%global import_path_conmon github.com/kubernetes-incubator/cri-o +%global git_conmon https://%{import_path_conmon} +%global commit_conmon 54478a2bafbc7d30691712bb8c1c32fbeb918a0c +%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) + +Name: podman +Version: 0.6.2 +Release: 10.git%{shortcommit}%{?dist} +Summary: Manage Pods, Containers and Container Images +License: ASL 2.0 +URL: %{git_podman} +Source0: %{git_podman}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #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} -BuildRequires: btrfs-progs-devel -BuildRequires: device-mapper-devel -BuildRequires: glib2-devel -BuildRequires: glibc-devel -BuildRequires: glibc-static -BuildRequires: git -BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: libgpg-error-devel -BuildRequires: libseccomp-devel -BuildRequires: libselinux-devel -BuildRequires: pkgconfig -BuildRequires: make -Requires: runc -Requires: skopeo-containers -Requires: conmon >= 2:1.10.0-3.gitb0f6d98 -Requires: buildah -Requires: containernetworking-cni >= 0.6.0-3 -Requires: iptables -Requires: atomic-registries -Requires: oci-systemd-hook +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: btrfs-progs-devel +BuildRequires: device-mapper-devel +BuildRequires: glib2-devel +BuildRequires: glibc-devel +BuildRequires: glibc-static +BuildRequires: git +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libgpg-error-devel +BuildRequires: libseccomp-devel +BuildRequires: libselinux-devel +BuildRequires: pkgconfig +Requires: runc +Requires: skopeo-containers +# can't use default conmon right now, so we ship our own +#Requires: conmon +Requires: containernetworking-cni > 0.6 +Requires: iptables +Requires: atomic-registries +Requires: oci-systemd-hook # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -189,7 +195,7 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 %description %{summary} -%{repo} provides a library for applications looking to use +libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. %if %{with varlink} @@ -207,10 +213,9 @@ This package contains Python 3 bindings for %{name}. %endif # varlink %if 0%{?with_devel} -%package devel +%package -n libpod-devel Summary: Library for applications looking to use Container Pods BuildArch: noarch -Provides: %{repo}-devel = %{version}-%{release} %if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/BurntSushi/toml) @@ -367,9 +372,11 @@ providing packages with %{import_path} prefix. %endif %prep -%autosetup -Sgit -n %{repo}-%{commit0} +%autosetup -Sgit -n %{repo}-%{commit} sed -i '/\/bin\/env/d' completions/bash/%{name} -mv pkg/hooks/README.md pkg/hooks/README-hooks.md + +# untar cri-o +tar zxf %{SOURCE1} %build mkdir _build @@ -383,17 +390,30 @@ export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_ta GOPATH=$GOPATH go generate ./cmd/podman/varlink/... GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -BUILDTAGS=$BUILDTAGS make %{name} docs +BUILDTAGS=$BUILDTAGS make binaries docs %if %{with varlink} -BUILDTAGS=$BUILDTAGS make varlink_generate python-%{name} - #untar contents for python-podman pushd contrib/python/dist tar zxf %{name}*.tar.gz popd %endif # varlink +# build conmon +pushd cri-o-%{commit_conmon} + +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-incubator,opencontainers} +ln -s $(dirs +1 -l) src/%{import_path_conmon} +popd + +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" +BUILDTAGS=$BUILDTAGS make -C conmon +popd + %install install -dp %{buildroot}%{_unitdir} %make_install PREFIX=%{buildroot}%{_prefix} install install.completions @@ -409,6 +429,10 @@ popd install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers +# install conmon +install -dp %{buildroot}%{_libexecdir}/%{name} +install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -466,7 +490,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if ! 0%{?gotest:1} %global gotest go test %endif - + %gotest %{import_path}/cmd/%{name} %gotest %{import_path}/libkpod %gotest %{import_path}/libpod @@ -478,21 +502,22 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +%{_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 +/usr/lib/tmpfiles.d/podman.conf %if %{with varlink} %files -n python3-%{name} %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %dir %{python3_sitelib} %{python3_sitelib}/* %endif # varlink @@ -500,207 +525,65 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %endif %changelog -* Sun Jun 10 2018 Dan Walsh - 0.6.2-9.git72c0b4f -- requires skopeo-containers, since containers-common is not yet in f27 +* Mon Jun 11 2018 Dan Walsh - 0.6.2-10.git72c0b4f +Bump to v0.6.2 * Fri Jun 08 2018 Dan Walsh - 0.6.2-8.git72c0b4f Bump to v0.6.2 -* Fri Jun 08 2018 Lokesh Mandvekar (Bot) - 0.6.2-7.git1cbce85 -- autobuilt 1cbce85 - -* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 0.6.2-6.gitb1ebad9 -- autobuilt b1ebad9 - -* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 0.6.2-5.git7b2b2bc -- autobuilt 7b2b2bc - -* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 0.6.2-4.git14cf6d2 -- autobuilt 14cf6d2 - -* Mon Jun 04 2018 Lokesh Mandvekar (Bot) - 0.6.2-3.gitcae49fc -- autobuilt cae49fc - -* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 0.6.2-2.git13f7450 -- autobuilt 13f7450 - -* Sat Jun 02 2018 Lokesh Mandvekar (Bot) - 0.6.2-1.git22e6f11 -- bump to 0.6.2 -- autobuilt 22e6f11 - -* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 0.6.1-4.gita9e9fd4 -- autobuilt a9e9fd4 - -* Thu May 31 2018 Lokesh Mandvekar (Bot) - 0.6.1-3.gita127b4f -- autobuilt a127b4f - -* Wed May 30 2018 Lokesh Mandvekar (Bot) - 0.6.1-2.git8ee0f2b -- autobuilt 8ee0f2b - -* Sat May 26 2018 Lokesh Mandvekar (Bot) - 0.6.1-1.git44d1c1c -- bump to 0.6.1 -- autobuilt 44d1c1c - -* Fri May 18 2018 Lokesh Mandvekar - 0.5.3-7.gitc54b423 -- make python3-podman the same version as the main package -- build python3-podman only for fedora >= 28 - -* Fri May 18 2018 Lokesh Mandvekar (Bot) - 0.5.3-6.gitc54b423 -- autobuilt c54b423 - -* Wed May 16 2018 Lokesh Mandvekar - 0.5.3-5.git624660c -- built commit 624660c -- New subapackage: python3-podman - -* Wed May 16 2018 Lokesh Mandvekar (Bot) - 0.5.3-4.git9fcc475 -- autobuilt 9fcc475 - -* Wed May 16 2018 Lokesh Mandvekar (Bot) - 0.5.3-3.git0613844 -- autobuilt 0613844 - -* Tue May 15 2018 Lokesh Mandvekar (Bot) - 0.5.3-2.git45838b9 -- autobuilt 45838b9 - -* Fri May 11 2018 Lokesh Mandvekar - 0.5.3-1.git07253fc -- bump to v0.5.3 -- built commit 07253fc +* Fri Jun 01 2018 baude - 0.6.1-1.git3e0ff12 +- Upstream release 0.6.1 -* Fri May 11 2018 Lokesh Mandvekar (Bot) - 0.5.2-5.gitcc1bad8 -- autobuilt cc1bad8 +* Fri May 25 2018 baude - 0.5.4-1.git1f2e2a2 +- Upstream release 0.5.4 -* Wed May 09 2018 Lokesh Mandvekar (Bot) - 0.5.2-4.git2526355 -- autobuilt 2526355 +* Sat May 19 2018 baude - 0.5.3-2.gitdc3f9df +- Correcting varlink socket paths and tighten security of sockets -* Tue May 08 2018 Lokesh Mandvekar (Bot) - 0.5.2-3.gitfaa8c3e -- autobuilt faa8c3e +* Fri May 18 2018 baude - 0.5.3-1.gitdc3f9df +- Upstream release 0.5.3 -* Sun May 06 2018 Lokesh Mandvekar (Bot) - 0.5.2-2.gitfa4705c -- autobuilt fa4705c +* Fri May 11 2018 baude - 0.5.2-1.git4631586 +- Upstream release 0.5.2 -* Sat May 05 2018 Lokesh Mandvekar (Bot) - 0.5.2-1.gitbb0e754 -- bump to 0.5.2 -- autobuilt bb0e754 +* Fri May 04 2018 baude - 0.5.1-1.gitd0fbfdc +- Upstream release 0.5.1 -* Fri May 04 2018 Lokesh Mandvekar (Bot) - 0.5.1-5.git5ae940a -- autobuilt 5ae940a +* Tue May 01 2018 baude - 0.4.4-2.git9924956 +- Do not mount default volumes +- Fix varlink systemd service file -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.5.1-4.git64dc803 -- autobuilt commit 64dc803 +* Fri Apr 27 2018 baude - 0.4.3-2.git4c0d8b0 +- Upstream release 0.4.4 -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.5.1-3.git970eaf0 -- autobuilt commit 970eaf0 +* Fri Apr 20 2018 baude - 0.4.3-1.git4c0d8b0d +- Upstream release 0.4.3 -* Tue May 01 2018 Lokesh Mandvekar (Bot) - 0.5.1-2.git7a0a855 -- autobuilt commit 7a0a855 +* Fri Apr 13 2018 baude - 0.4.2-1.gitf740ee0b +- Upstream release 0.4.2 +- Update conmon for new console-related features -* Sun Apr 29 2018 Lokesh Mandvekar - 0.5.1-1.giteda0fd7 -- reflect version number correctly -- my builder script error ended up picking the wrong version number previously +* Thu Apr 05 2018 baude - 0.4.1-1.gitb51d3270 +- Upstream release 0.4.1 -* Sun Apr 29 2018 Lokesh Mandvekar (Bot) - 0.4.2-5.giteda0fd7 -- autobuilt commit eda0fd7 +* Tue Apr 3 2018 Dan Walsh - 0.3.5-2.git712f3b8cf14 +- Add proper version of conmon -* Sat Apr 28 2018 Lokesh Mandvekar (Bot) - 0.4.2-4.git6774425 -- autobuilt commit 6774425 - -* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 0.4.2-3.git39a7a77 -- autobuilt commit 39a7a77 - -* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 0.4.2-2.git58cb8f7 -- autobuilt commit 58cb8f7 - -* Wed Apr 25 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de -- bump to 0.4.2 -- autobuilt commit bef93de - -* Tue Apr 24 2018 Lokesh Mandvekar - 0.4.4-1.git398133e -- use correct version number - -* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 0.4.2-22.git398133e -- autobuilt commit 398133e - -* Sun Apr 22 2018 Lokesh Mandvekar (Bot) - 0.4.2-21.gitcf1d884 -- autobuilt commit cf1d884 - -* Fri Apr 20 2018 Lokesh Mandvekar (Bot) - 0.4.2-20.git9b457e3 -- autobuilt commit 9b457e3 - -* Fri Apr 20 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de9.git228732d -- autobuilt commit 228732d - -* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de8.gitf2658ec -- autobuilt commit f2658ec - -* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de7.git6a9dbf3 -- autobuilt commit 6a9dbf3 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de6.git96d1162 -- autobuilt commit 96d1162 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de5.git96d1162 -- autobuilt commit 96d1162 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de4.git6c5ebb0 -- autobuilt commit 6c5ebb0 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de3.gitfa8442e -- autobuilt commit fa8442e - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de2.gitfa8442e -- autobuilt commit fa8442e - -* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de1.gitfa8442e -- autobuilt commit fa8442e - -* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 0.4.2-1.gitbef93de0.git62b59df -- autobuilt commit 62b59df - -* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 0.4.2-9.git191da31 -- autobuilt commit 191da31 - -* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 0.4.2-8.git6f51a5b -- autobuilt commit 6f51a5b - -* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 0.4.2-7.git77a1665 -- autobuilt commit 77a1665 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-6.git864b9c0 -- autobuilt commit 864b9c0 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-5.git864b9c0 -- autobuilt commit 864b9c0 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 0.4.2-4.git998fd2e -- autobuilt commit 998fd2e - -* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 0.4.2-3.git998fd2e -- autobuilt commit 998fd2e - -* Sun Apr 08 2018 Lokesh Mandvekar - 0.4.2-2.git998fd2e -- autobuilt commit 998fd2e - -* Sun Apr 08 2018 Lokesh Mandvekar - 0.4.2-1.gitbef93de.git998fd2e -- bump to 0.4.2 -- autobuilt commit 998fd2e - -* Thu Mar 29 2018 baude - 0.3.5-2.gitdb6bf9e3 +* Thu Mar 29 2018 baude - 0.3.5-1.git712f3b8cf14 - Upstream release 0.3.5 -* Tue Mar 27 2018 Lokesh Mandvekar - 0.3.5-1.git304bf53 -- built commit 304bf53 - -* Fri Mar 23 2018 baude - 0.3.4-1.git57b403e +* Fri Mar 23 2018 baude - 0.3.4-1.git57b403eda155d321d8aa29cfa0085aac8ce28a57 - Upstream release 0.3.4 * Fri Mar 16 2018 baude - 0.3.3-2.dev.gitbc358eb @@ -714,9 +597,9 @@ Bump to v0.6.2 - Release 0.3.2-1 * Sun Mar 04 2018 baude - 0.3.1-2.git98b95ff -- Correct RPM version +- version correction -* Fri Mar 02 2018 baude - 0.3.1-1-gitc187538 +* Fri Mar 02 2018 baude - 0.3.1-1.gitc187538 - Release 0.3.1-1 * Sun Feb 25 2018 Peter Robinson 0.2.2-2.git525e3b1