diff --git a/.gitignore b/.gitignore index d138b88..4ba7360 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/cri-o-464dba6.tar.gz -SOURCES/libpod-9551f6b.tar.gz +SOURCES/cri-o-9b1f0a0.tar.gz +SOURCES/libpod-14fdcd0.tar.gz diff --git a/.podman.metadata b/.podman.metadata index cea278a..840ed42 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,2 +1,2 @@ -df547f025f22dd497230d39527e7d584b53b7f6f SOURCES/cri-o-464dba6.tar.gz -935d80f0a61d6064abc3b00e58262188a65992c5 SOURCES/libpod-9551f6b.tar.gz +b53ff7dd655dec8ddab85b7782a2d41e6bdcb301 SOURCES/cri-o-9b1f0a0.tar.gz +23daefa6b411aed4ebfc08fcec343f37af19dcf4 SOURCES/libpod-14fdcd0.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index dc98fff..c54d7f9 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -18,17 +18,17 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 9551f6bb379d4af56dfb63ddf0f3682e40a6694e +%global commit 14fdcd0dedaec2fa89ccb58840e297ecb98cc617 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path_conmon github.com/kubernetes-sigs/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 464dba6f310e2efd43d75ceef1acb9642cf9c77d +%global commit_conmon 9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 0.12.1.2 -Release: 2.git%{shortcommit}%{?dist} +Version: 1.3.2 +Release: 1.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -37,10 +37,11 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar. # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}} -ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 %{ix86} +ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?centos} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: make %else BuildRequires: go-toolset-1.10 #BuildRequires: openssl-devel @@ -59,6 +60,7 @@ BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: pkgconfig +BuildRequires: systemd-devel Requires: runc Requires: skopeo-containers >= 0.1.29-3 # can't use default conmon right now, so we ship our own @@ -195,6 +197,7 @@ pages and %{name}. %prep %autosetup -Sgit -n %{repo}-%{commit} mv pkg/hooks/README.md pkg/hooks/README-hooks.md +sed -i '/bin\/podman-remote/d' Makefile # untar cri-o tar zxf %{SOURCE1} @@ -209,7 +212,8 @@ ln -s vendor src export GOPATH=$(pwd):$(pwd)/_build export BUILDTAGS="selinux seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" -go generate $(pwd)/cmd/%{name}/varlink/... +# no varlink in rhel7 +#%%gogenerate $(pwd)/cmd/%%{name}/varlink/... %gobuild -o bin/%{name} %{import_path}/cmd/%{name} make docs @@ -247,7 +251,7 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name} -rm -rf %{buildroot}/src/github.com/containers/* +rm -rf %{buildroot}/src/github.com #https://bugzilla.redhat.com/show_bug.cgi?id=1657303 varlink not in rhel7 rm -f %{buildroot}/%{_unitdir}/io.%{name}.service %{buildroot}/%{_unitdir}/io.%{name}.socket @@ -267,6 +271,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/pkg/registrar %endif +%triggerpostun -- %{name} < 1.1 +%{_bindir}/%{name} system renumber +exit 0 + #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -274,21 +282,57 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md %{_bindir}/%{name} -%{_mandir}/man1/podman*.1* +%{_mandir}/man1/%{name}*.1* %{_mandir}/man5/*.5* %{_datadir}/bash-completion/completions/* +%{_datadir}/zsh/site-functions/_%{name} %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist %{_datadir}/containers/%{repo}.conf -%{_prefix}/lib/tmpfiles.d/%{name}.conf +%{_usr}/lib/tmpfiles.d/%{name}.conf %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* %changelog -* Wed Feb 13 2019 Johnny Hughes -- Build on i386, use golang toolset on CentOS +* Wed May 29 2019 Lokesh Mandvekar - 1.3.2-1.git14fdcd0 +- Resolves: #1714700 +- bump to v1.3.2 + +* Thu May 23 2019 Lokesh Mandvekar - 1.3.1-1.git7210727 +- Resolves: #1710265 +- bump to v1.3.1 + +* Tue May 14 2019 Lokesh Mandvekar - 1.3.0-1.git139afa7 +- Resolves: #1701922, #1689862, #1418418, #1418422, #1649044, #1534505 +- BR: systemd-devel + +* Tue Apr 02 2019 Lokesh Mandvekar - 1.2.0-3.git3bd528e +- Ensure correct upstream version number + +* Mon Apr 01 2019 Frantisek Kluknavsky - 1.2-2.git3bd528e +- rebase + +* Wed Mar 06 2019 Lokesh Mandvekar - 1.1.2-2.git0ad9b6b +- system renumber when upgrading from version lower than 1.1 +- centos build envs don't have make by default + +* Wed Mar 06 2019 Lokesh Mandvekar - 1.1.2-1.git0ad9b6b +- bump to v1.1.2 + +* Fri Feb 15 2019 Frantisek Kluknavsky - 1.0.1-2.git921f98f +- last rebase was to version 1.0.1 actually + +* Mon Feb 11 2019 Frantisek Kluknavsky - 1.0.0-3.git921f98f +- rebase + +* Mon Feb 11 2019 Frantisek Kluknavsky - 1.0.0-2.git6d7d90e +- rebase + +* Tue Jan 15 2019 Frantisek Kluknavsky - 1.0.0-1.git82e8011 +- rebase to v1, yay! +- rebase conmon to 9b1f0a08285a7f74b21cc9b6bfd98a48905a7ba2 * Fri Dec 14 2018 Frantisek Kluknavsky - 0.12.1.2-2.git9551f6b - rebase