Revert "UPdate spec"
This reverts commit 8c0179c76b
.
It used a Version value which isn't present anywhere upstream
yet.
This commit is contained in:
parent
8c0179c76b
commit
277ff27c2f
1
.gitignore
vendored
1
.gitignore
vendored
@ -269,4 +269,3 @@
|
|||||||
/libpod-39fdf91.tar.gz
|
/libpod-39fdf91.tar.gz
|
||||||
/libpod-d9bdd3c.tar.gz
|
/libpod-d9bdd3c.tar.gz
|
||||||
/libpod-7c4e444.tar.gz
|
/libpod-7c4e444.tar.gz
|
||||||
/libpod-0906b32.tar.gz
|
|
||||||
|
64
podman.spec
64
podman.spec
@ -22,7 +22,7 @@
|
|||||||
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
|
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
|
||||||
%global import_path %{provider_prefix}
|
%global import_path %{provider_prefix}
|
||||||
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
|
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
|
||||||
%global commit0 0906b32087c3d7db6844873a7d46241430a1b065
|
%global commit0 7c4e4449b0372c5b617c2708042dd2e5fafe7d22
|
||||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||||
|
|
||||||
%global import_path_conmon github.com/containers/conmon
|
%global import_path_conmon github.com/containers/conmon
|
||||||
@ -32,10 +32,10 @@
|
|||||||
|
|
||||||
Name: podman
|
Name: podman
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 1.5.0
|
Version: 1.4.3
|
||||||
# Rawhide almost always ships unreleased builds,
|
# Rawhide almost always ships unreleased builds,
|
||||||
# so release tag should be of the form 0.N.blahblah
|
# so release tag should be of the form 0.N.blahblah
|
||||||
Release: 0.1.dev.git%{shortcommit0}%{?dist}
|
Release: 0.30.dev.git%{shortcommit0}%{?dist}
|
||||||
Summary: Manage Pods, Containers and Container Images
|
Summary: Manage Pods, Containers and Container Images
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://%{name}.io/
|
URL: https://%{name}.io/
|
||||||
@ -68,9 +68,8 @@ Requires: nftables
|
|||||||
#Requires: conmon
|
#Requires: conmon
|
||||||
Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
|
Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
|
||||||
Recommends: container-selinux
|
Recommends: container-selinux
|
||||||
Recommends: slirp4netns >= 0.3.0-2
|
Recommends: slirp4netns >= 0.3-0
|
||||||
Recommends: fuse-overlayfs >= 0.3-8
|
Recommends: fuse-overlayfs >= 0.3-8
|
||||||
Recommends: libvarlink-util >= 18-1
|
|
||||||
|
|
||||||
# vendored libraries
|
# vendored libraries
|
||||||
# awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort
|
# awk '{print "Provides: bundled(golang("$1")) = "$2}' vendor.conf | sort
|
||||||
@ -201,30 +200,6 @@ This package installs a script named docker that emulates the Docker CLI by
|
|||||||
executes %{name} commands, it also creates links between all Docker CLI man
|
executes %{name} commands, it also creates links between all Docker CLI man
|
||||||
pages and %{name}.
|
pages and %{name}.
|
||||||
|
|
||||||
%package manpages
|
|
||||||
Summary: Man pages for the %{name} commands
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description manpages
|
|
||||||
Man pages for the %{name} commands
|
|
||||||
|
|
||||||
%files manpages
|
|
||||||
%{_mandir}/man1/%{name}*.1*
|
|
||||||
|
|
||||||
%package remote
|
|
||||||
Summary: (Experimental) Remote client for managing %{name} containers
|
|
||||||
Recommends: %{name}-manpages = %{epoch}:%{version}-%{release}
|
|
||||||
|
|
||||||
%description remote
|
|
||||||
Remote client for managing %{name} containers.
|
|
||||||
|
|
||||||
This experimental remote client is under heavy development. Please do not
|
|
||||||
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.
|
|
||||||
|
|
||||||
%if 0%{?with_devel}
|
%if 0%{?with_devel}
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Library for applications looking to use Container Pods
|
Summary: Library for applications looking to use Container Pods
|
||||||
@ -397,6 +372,30 @@ Requires: jq
|
|||||||
|
|
||||||
This package contains system tests for %{name}
|
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}
|
||||||
|
|
||||||
|
%description remote
|
||||||
|
Remote client for managing %{name} containers.
|
||||||
|
|
||||||
|
This experimental remote client is under heavy development. Please do not
|
||||||
|
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.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -Sgit -n %{repo}-%{commit0}
|
%autosetup -Sgit -n %{repo}-%{commit0}
|
||||||
|
|
||||||
@ -411,18 +410,14 @@ ln -s ../../../../ src/%{import_path}
|
|||||||
popd
|
popd
|
||||||
ln -s vendor src
|
ln -s vendor src
|
||||||
export GOPATH=$(pwd)/_build:$(pwd)
|
export GOPATH=$(pwd)/_build:$(pwd)
|
||||||
|
|
||||||
export GO111MODULE=off
|
|
||||||
%gogenerate ./cmd/%{name}/varlink/...
|
%gogenerate ./cmd/%{name}/varlink/...
|
||||||
|
|
||||||
# build %%{name}
|
# 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)"
|
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)"
|
||||||
export GO111MODULE=off
|
|
||||||
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
|
%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
|
||||||
|
|
||||||
# build %%{name}-remote
|
# 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)"
|
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)"
|
||||||
export GO111MODULE=off
|
|
||||||
%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
|
%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
|
||||||
|
|
||||||
# build conmon
|
# build conmon
|
||||||
@ -570,9 +565,6 @@ exit 0
|
|||||||
%{_datadir}/%{name}/test
|
%{_datadir}/%{name}/test
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Jun 27 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.5.0-0.1.dev
|
|
||||||
- Bump up to latest on master
|
|
||||||
|
|
||||||
* Sun Jun 23 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.4.3-0.30.dev.git7c4e444
|
* Sun Jun 23 2019 Lokesh Mandvekar (Bot) <lsm5+bot@fedoraproject.org> - 2:1.4.3-0.30.dev.git7c4e444
|
||||||
- autobuilt 7c4e444
|
- autobuilt 7c4e444
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51
|
SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51
|
||||||
SHA512 (libpod-0906b32.tar.gz) = c519ad2011967450ba325eb9967042cb1069216f4a086e730c793cbb2a88170ddf0fe16b5d1883432329ad5147acbf9e55e7db3c5f94c5b53ff2148a6154ee93
|
SHA512 (libpod-7c4e444.tar.gz) = 9939f37d05f633574329f9866e5f5adc3ed8b9a5f1fb5f50ee8cc25fb3ef98504dfd422b03b275cc4a5fed01553200d64d0b4d35741c19205a5e12bb969bc415
|
||||||
|
Loading…
Reference in New Issue
Block a user