diff --git a/.gitignore b/.gitignore index 4c0ef2d..490e540 100644 --- a/.gitignore +++ b/.gitignore @@ -269,3 +269,5 @@ /libpod-39fdf91.tar.gz /libpod-d9bdd3c.tar.gz /libpod-7c4e444.tar.gz +/libpod-0906b32.tar.gz +/libpod-f7407f2.tar.gz diff --git a/podman.spec b/podman.spec index 4459176..45cef89 100644 --- a/podman.spec +++ b/podman.spec @@ -4,8 +4,13 @@ %global with_check 0 %global with_unit_test 0 +%if 0%{?fedora} +#### DO NOT REMOVE - NEEDED FOR CENTOS %bcond_without varlink %define gogenerate go generate +%else +%bcond_with varlink +%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -22,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 7c4e4449b0372c5b617c2708042dd2e5fafe7d22 +%global commit0 f7407f2eb512e1407f8281009eb829f37405119b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -31,11 +36,13 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman +%if 0%{?fedora} Epoch: 2 -Version: 1.4.3 +%endif +Version: 1.4.5 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.30.dev.git%{shortcommit0}%{?dist} +Release: 0.1.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -48,7 +55,7 @@ BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git -BuildRequires: go-md2man +BuildRequires: golang-github-cpuguy83-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel @@ -66,10 +73,18 @@ Requires: iptables Requires: nftables # #1686813 - conmon hasn't been made independent yet #Requires: conmon +%if 0%{?fedora} Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} Recommends: container-selinux -Recommends: slirp4netns >= 0.3-0 +Recommends: slirp4netns >= 0.3.0-2 Recommends: fuse-overlayfs >= 0.3-8 +%else +#### DO NOT REMOVE - NEEDED FOR CENTOS +Requires: %{name}-manpages = %{version}-%{release} +Requires: container-selinux +Requires: slirp4netns >= 0.3.0-2 +Requires: runc >= 1.0.0-57 +%endif # vendored libraries # awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort @@ -360,6 +375,7 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%if 0%{?fedora} %package tests Summary: Tests for %{name} @@ -372,16 +388,6 @@ Requires: jq This package contains system tests for %{name} -%package manpages -Summary: Man pages for the %{name} commands -BuildArch: noarch - -%files manpages -%{_mandir}/man1/%{name}*.1* - -%description manpages -Man pages for the %{name} commands - %package remote Summary: (Experimental) Remote client for managing %{name} containers Recommends: %{name}-manpages = %{epoch}:%{version}-%{release} @@ -395,6 +401,17 @@ run %{name}-remote in production. %{name}-remote uses the varlink connection to connect to a %{name} client to manage pods, containers and container images. %{name}-remote supports ssh connections as well. +%endif + +%package manpages +Summary: Man pages for the %{name} commands +BuildArch: noarch + +%files manpages +%{_mandir}/man1/%{name}*.1* + +%description manpages +Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -410,15 +427,19 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) +export GO111MODULE=off %gogenerate ./cmd/%{name}/varlink/... # build %%{name} export BUILDTAGS="systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} +%if 0%{?fedora} +#### DO NOT REMOVE - NEEDED FOR CENTOS # build %%{name}-remote export BUILDTAGS="remoteclient systemd varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} +%endif # build conmon pushd conmon-%{commit_conmon} @@ -429,7 +450,9 @@ popd install -dp %{buildroot}%{_unitdir} PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ install.bin \ +%if 0%{?fedora} install.remote \ +%endif install.man \ install.cni \ install.systemd \ @@ -556,6 +579,8 @@ exit 0 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %endif +#### DO NOT REMOVE - NEEDED FOR CENTOS +%if 0%{?fedora} %files remote %license LICENSE %{_bindir}/%{name}-remote @@ -563,8 +588,14 @@ exit 0 %files tests %license LICENSE %{_datadir}/%{name}/test +%endif %changelog +* Sun Jul 07 2019 Lokesh Mandvekar - 2:1.4.5-0.1.dev.gitf7407f2 +- bump to v1.4.5-dev +- use new name for go-md2man +- include centos conditionals + * Sun Jun 23 2019 Lokesh Mandvekar (Bot) - 2:1.4.3-0.30.dev.git7c4e444 - autobuilt 7c4e444 diff --git a/sources b/sources index d3d4751..5a575ca 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-7c4e444.tar.gz) = 9939f37d05f633574329f9866e5f5adc3ed8b9a5f1fb5f50ee8cc25fb3ef98504dfd422b03b275cc4a5fed01553200d64d0b4d35741c19205a5e12bb969bc415 +SHA512 (libpod-0906b32.tar.gz) = c519ad2011967450ba325eb9967042cb1069216f4a086e730c793cbb2a88170ddf0fe16b5d1883432329ad5147acbf9e55e7db3c5f94c5b53ff2148a6154ee93 +SHA512 (libpod-f7407f2.tar.gz) = 6fe9c08ca0711c9875f89193888bf76102d6534ec9642e0dd3bea9d6ec45c143f6aec35dfa03615da9a9c855efbcbce54f5cea2af6724cd1971c58f877ea273d