rpms/podman
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Bump up to latest on master

Browse Source
This commit is contained in:
Daniel J Walsh 2019-05-24 07:52:44 -04:00
parent 5b79715104
commit 6fe4e6b38b
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
podman.spec
View File

@ -43,8 +43,8 @@ Epoch: 2
%else %else
Epoch: 1 Epoch: 1
%endif %endif
Version: 1.3.1 Version: 1.3.2
Release: 1.1.dev.git%{shortcommit0}%{?dist} Release: 0.1.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://podman.io/ URL: https://podman.io/
@ -393,6 +393,7 @@ 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)
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote
export BUILDTAGS="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="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)"
%gogenerate ./cmd/%{name}/varlink/... %gogenerate ./cmd/%{name}/varlink/...
%gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
@ -406,7 +407,6 @@ ln -s $(dirs +1 -l) src/%{import_path_conmon}
popd popd
ln -s vendor src ln -s vendor src
export GOPATH=$(pwd)/_output:$(pwd) export GOPATH=$(pwd)/_output:$(pwd)
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} podman-remote
export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub" export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub"
BUILDTAGS=$BUILDTAGS make -C conmon BUILDTAGS=$BUILDTAGS make -C conmon
popd popd
@ -415,6 +415,7 @@ popd
install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_unitdir}
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
install.bin \ install.bin \
install.remote \
install.man \ install.man \
install.cni \ install.cni \
install.systemd \ install.systemd \
@ -508,8 +509,8 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
%{_mandir}/man5/*.5* %{_mandir}/man5/*.5*
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
# By "owning" the site-functions dir, we don't need to Require zsh # By "owning" the site-functions dir, we don't need to Require zsh
%{_datadir}/zsh/site-functions %dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/* %{_datadir}/zsh/site-functions/_podman
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/conmon %{_libexecdir}/%{name}/conmon
%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
@ -571,7 +572,7 @@ exit 0
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Fri May 24 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.3.1-1.1.dev.git5296428 * Fri May 24 2019 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.3.2-0.1.dev.git5296428
Bump up to latest on master Bump up to latest on master
* Fri May 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.3.1-0.1.dev.git9ae3221 * Fri May 10 2019 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.3.1-0.1.dev.git9ae3221