packages/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker:remove go-md2man build require

Browse Source 
(cherry picked from commit 547bf388089cb8f0a8c90e8c25faa08e09b1e99b)
This commit is contained in:
chenjiankun 2021-05-06 15:20:48 +08:00 committed by openeuler-sync-bot
parent 94d0954ade
commit 7fd3c11f8c
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION-openeuler
View File

@ -1 +1 @@
18.09.0.202 18.09.0.203

31
docker-engine-openeuler.spec
View File

@ -1,6 +1,6 @@
Name: docker-engine Name: docker-engine
Version: 18.09.0 Version: 18.09.0
Release: 202 Release: 203
Summary: The open-source application container engine Summary: The open-source application container engine
Group: Tools/Docker Group: Tools/Docker
@ -14,7 +14,7 @@ URL: https://mobyproject.org
# required packages for build # required packages for build
# most are already in the container (see contrib/builder/rpm/ARCH/generate.sh) # 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: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel
BuildRequires: tar containerd docker-runc docker-proxy BuildRequires: tar containerd docker-runc docker-proxy
@ -63,8 +63,9 @@ ln -sf ${WORKDIR}/components/engine .gopath/src/github.com/docker/docker
cd .gopath/src/github.com/docker/cli cd .gopath/src/github.com/docker/cli
make dynbinary 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 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 rm -rf .gopath
cd ${WORKDIR} cd ${WORKDIR}
@ -113,12 +114,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 -p -m 644 components/cli/contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish
# install manpages # install manpages
install -d %{buildroot}%{_mandir}/man1 # install -d %{buildroot}%{_mandir}/man1
install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1 # install -p -m 644 components/cli/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1
install -d %{buildroot}%{_mandir}/man5 # install -d %{buildroot}%{_mandir}/man5
install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5 # install -p -m 644 components/cli/man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
install -d %{buildroot}%{_mandir}/man8 # install -d %{buildroot}%{_mandir}/man8
install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8 # install -p -m 644 components/cli/man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
# add vimfiles # add vimfiles
install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc
@ -151,9 +152,9 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B
/usr/share/zsh/vendor-completions/_docker /usr/share/zsh/vendor-completions/_docker
/usr/share/fish/vendor_completions.d/docker.fish /usr/share/fish/vendor_completions.d/docker.fish
%doc %doc
/%{_mandir}/man1/* # /%{_mandir}/man1/*
/%{_mandir}/man5/* # /%{_mandir}/man5/*
/%{_mandir}/man8/* # /%{_mandir}/man8/*
%config(noreplace,missingok) /etc/sysconfig/docker %config(noreplace,missingok) /etc/sysconfig/docker
%config(noreplace,missingok) /etc/sysconfig/docker-storage %config(noreplace,missingok) /etc/sysconfig/docker-storage
@ -200,6 +201,12 @@ fi
%endif %endif
%changelog %changelog
* Thu May 6 2021 chenjiankun<chenjiankun1@huawei.com> - 18.09.0-203
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove go-md2man build require
* Thu Mar 18 2021 xiadanni<xiadanni1@huawei.com> - 18.09.0-202 * Thu Mar 18 2021 xiadanni<xiadanni1@huawei.com> - 18.09.0-202
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA