From 9a18681ba62d1a297809c243607a7b3763131c36 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Mon, 16 Jul 2018 17:29:50 -0700 Subject: [WIP] Refactor and simplify python builds * pypodman namespaced in site-packages * version numbers pulled from requirements.txt * add python-podman spec file to install eggs Signed-off-by: Jhon Honce Closes: #1106 Approved by: rhatdan --- contrib/spec/podman.spec.in | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) (limited to 'contrib/spec/podman.spec.in') diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index e40cf47a7..1f1274a4d 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -205,26 +205,10 @@ Requires: python3-varlink Requires: python3-dateutil Provides: python3-%{name} = %{version}-%{release} -Summary: Python 3 bindings for %{name} +Summary: Python 3 bindings and client for %{name} %description -n python3-%{name} -This package contains Python 3 bindings for %{name}. - -%package -n python3-py%{name} -BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-varlink - -Requires: python3-setuptools -Requires: python3-varlink -Requires: python3-dateutil - -Provides: python3-py%{name} = %{version}-%{release} -Summary: Python 3 tool for %{name} - -%description -n python3-py%{name} -This package contains Python 3 tool for %{name}. +This package contains Python 3 bindings and client for %{name}. %endif # varlink %if 0%{?with_devel} @@ -403,18 +387,6 @@ GOPATH=$GOPATH go generate ./cmd/podman/varlink/... GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} BUILDTAGS=$BUILDTAGS make binaries docs -%if %{with varlink} -#untar contents for python-podman -pushd contrib/python/podman/dist -tar zxf %{name}*.tar.gz -popd - -#untar contents for python-pypodman -pushd contrib/python/pypodman/dist -tar zxf %{name}*.tar.gz -popd -%endif #varlink - %install install -dp %{buildroot}%{_unitdir} %make_install PREFIX=%{buildroot}%{_prefix} install install.completions @@ -502,6 +474,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %doc README.md CONTRIBUTING.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} +%{_bindir}/py%{name} %{_mandir}/man1/*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* -- cgit v1.2.3-54-g00ecf