diff --git a/VERSION-openeuler b/VERSION-openeuler index 0ec0e1aca67f7291038bc50621ce4301c95c6116..8090c538bdaa22b3554e41cbb44ef16fddba88b6 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -18.09.0.112 +18.09.0.113 diff --git a/docker.spec b/docker.spec index d752abb441b22a96d3aad6e6c6c3819f2526c6f0..cad96acb458c30cafb9e73248104ba7113b4c6e6 100644 --- a/docker.spec +++ b/docker.spec @@ -1,6 +1,6 @@ Name: docker-engine Version: 18.09.0 -Release: 112 +Release: 113 Summary: The open-source application container engine Group: Tools/Docker @@ -20,7 +20,7 @@ URL: https://mobyproject.org # required packages for build # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh) -BuildRequires: pkgconfig(systemd) golang >= 1.8.3 go-md2man btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel +BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel BuildRequires: tar containerd docker-runc docker-proxy @@ -73,8 +73,9 @@ ln -sf ${WORKDIR}/components/engine .gopath/src/github.com/docker/docker cd .gopath/src/github.com/docker/cli make dynbinary +# man is provided in docker --help and dockerd --help # ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here -./man/md2man-all.sh -q +# ./man/md2man-all.sh -q rm -rf .gopath cd ${WORKDIR} @@ -123,12 +124,12 @@ install -p -m 644 components/cli/contrib/completion/zsh/_docker $RPM_BUILD_ROOT/ install -p -m 644 components/cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish # install manpages -install -d %{buildroot}%{_mandir}/man1 -install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1 -install -d %{buildroot}%{_mandir}/man5 -install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5 -install -d %{buildroot}%{_mandir}/man8 -install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8 +# install -d %{buildroot}%{_mandir}/man1 +# install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +# install -d %{buildroot}%{_mandir}/man5 +# install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5 +# install -d %{buildroot}%{_mandir}/man8 +# install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8 # add vimfiles install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc @@ -161,9 +162,9 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B /usr/share/zsh/vendor-completions/_docker /usr/share/fish/vendor_completions.d/docker.fish %doc -/%{_mandir}/man1/* -/%{_mandir}/man5/* -/%{_mandir}/man8/* +#/%{_mandir}/man1/* +#/%{_mandir}/man5/* +#/%{_mandir}/man8/* %config(noreplace,missingok) /etc/sysconfig/docker %config(noreplace,missingok) /etc/sysconfig/docker-storage @@ -210,6 +211,12 @@ fi %endif %changelog +* Tue Feb 09 2021 lixiang - 18.09.0-113 +- Type:enhancement +- CVE:NA +- SUG:restart +- DESC:remove go-md2man build require + * Mon Jan 4 2021 yangyanchao - 18.09.0-111 - Type:requirement - ID:NA diff --git a/gen-commit.sh b/gen-commit.sh index 6b5dd751ffd16cfdda5b7f9898eb30405ad15cd7..a21db184e7df62c3c7e67fff2fab892be066de5f 100755 --- a/gen-commit.sh +++ b/gen-commit.sh @@ -18,7 +18,7 @@ echo 18.09.0.$new_version > VERSION-openeuler author=$(git config user.name) email=$(git config user.email) -version=$(head -1 docker.spec | awk '{print $NF}') +version=$(head -10 docker.spec | grep Version | awk '{print $NF}') release=$(head -10 docker.spec | grep Release | awk '{print $2}' | awk -F% '{print $1}') new_all=$version-$release new_changelog=$(cat << EOF diff --git a/git-commit b/git-commit index c0a03a646fe7630c2909006db1f9feac2148fab1..9c2a8e84c33fb5dd3ac0345c3f96163f16d4309d 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -I4dc92059d90415199fcd143d75cc68cfdb67c430 +e9d595711a6ccf4cc603740dddbb3655c6b7d922