diff --git a/.gitignore b/.gitignore index 67e5f11..e5868f7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /libpod-9924956.tar.gz /libpod-d0fbfdc.tar.gz /libpod-4631586.tar.gz +/libpod-dc3f9df.tar.gz diff --git a/podman.spec b/podman.spec index 8ca2132..47cf067 100644 --- a/podman.spec +++ b/podman.spec @@ -23,7 +23,14 @@ # Generate unit-test rpm %global with_unit_test 0 +%if 0%{?fedora} >= 28 +%bcond_without varlink +%else +%bcond_with varlink +%endif + %if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} @@ -41,7 +48,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 4631586aa3928804c164fce027b6589477f97fa0 +%global commit dc3f9df0b35d47f48dd652687b8a5cf5ab01f778 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-incubator/cri-o @@ -50,7 +57,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.5.2 +Version: 0.5.3 Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 @@ -191,6 +198,20 @@ Provides: bundled(golang(gopkg.in/yaml.v2)) = v2 libpod provides a library for applications looking to use the Container Pod concept popularized by Kubernetes. +%if %{with varlink} +%package -n python3-%{name} +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-varlink +Requires: python3-varlink +Provides: python3-%{name} = %{version}-%{release} +Summary: Python 3 bindings for %{name} + +%description -n python3-%{name} +This package contains Python 3 bindings for %{name}. +%endif # varlink + %if 0%{?with_devel} %package -n libpod-devel Summary: Library for applications looking to use Container Pods @@ -352,8 +373,7 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{commit} -sed -i '/\/bin\/bash/d' completions/bash/%{name} -mv pkg/hooks/README.md pkg/hooks/README-hooks.md +sed -i '/\/bin\/env/d' completions/bash/%{name} # untar cri-o tar zxf %{SOURCE1} @@ -369,7 +389,14 @@ export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} -BUILDTAGS=$BUILDTAGS make docs +BUILDTAGS=$BUILDTAGS make binaries docs + +%if %{with varlink} +#untar contents for python-podman +pushd contrib/python/dist +tar zxf %{name}*.tar.gz +popd +%endif # varlink # build conmon pushd cri-o-%{commit_conmon} @@ -390,6 +417,13 @@ popd install -dp %{buildroot}%{_unitdir} %make_install PREFIX=%{buildroot}%{_prefix} install install.completions +%if %{with varlink} +#install python-podman +pushd contrib/python +%{__python3} setup.py install --root %{buildroot} +popd +%endif # varlink + # install libpod.conf install -dp %{buildroot}%{_datadir}/containers install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers @@ -467,7 +501,7 @@ 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* @@ -478,20 +512,31 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/io.%{project}.%{name}.service %{_unitdir}/io.%{project}.%{name}.socket +%if %{with varlink} +%files -n python3-%{name} +%license LICENSE +%doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md +%dir %{python3_sitelib} +%{python3_sitelib}/* +%endif # varlink + %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 +* Fri May 18 2018 baude - 0.5.3-1.gitdc3f9df +- Upstream release 0.5.3 + * Fri May 11 2018 baude - 0.5.2-1.git4631586 - Upstream release 0.5.2 diff --git a/sources b/sources index 1809d7e..d87d5ab 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 -SHA512 (libpod-4631586.tar.gz) = 4ae2ebf89b6d5333145c4be8da6a4babfef3095b335b5cc788665f14b8ade07c0f14210b2656eb3c9e4c144e10b2ea3be786d679f938a6a64cdd6da9cbb42d0c +SHA512 (libpod-dc3f9df.tar.gz) = 57c8a8ed0f840670bf33809e610904be30eab1b21eabad094e241ba97d40efb5c2e13aa67001fbad131517454375fb7bc2aa0a0a2e26a25a7bbb179f77c47b3d