Accepting request 1138822 from home:dancermak:branches:Virtualization:containers

Enable manpage generation

OBS-URL: https://build.opensuse.org/request/show/1138822
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=168
This commit is contained in:
Dan Čermák 2024-01-25 16:07:25 +00:00 committed by Git OBS Bridge
parent 05de9e69c0
commit 20e48a9c6b
3 changed files with 25 additions and 21 deletions

View File

@ -1,2 +1 @@
addFilter ("^containerd(-kubic)?.*: W: statically-linked-binary /usr/sbin/containerd-shim")
addFilter ("^containerd(-kubic)?-test.noarch: [WE]: (hidden-file-or-dir|script-without-shebang|devel-file-in-non-devel-package|env-script-interpreter).* /usr/src/containerd/.*")
addFilter ("^containerd(-kubic)?.*: E: statically-linked-binary /usr/sbin/containerd-shim*")

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 15 11:12:05 UTC 2024 - Dan Čermák <dcermak@suse.com>
- Enable manpage generation
- Make devel package noarch
- adjust rpmlint filters
-------------------------------------------------------------------
Mon Jan 8 12:12:00 UTC 2024 - Danish Prakash <danish.prakash@suse.com>

View File

@ -91,6 +91,7 @@ separately from Docker.
Summary: Source code for containerd
Group: Development/Libraries/Go
Requires: %{name} = %{version}
BuildArch: noarch
%description devel
This package contains the source code needed for building packages that
@ -107,11 +108,11 @@ reference the following Go import paths: github.com/containerd/containerd
%goprep %{import_path}
BUILDTAGS="apparmor selinux seccomp"
make \
BUILDTAGS="$BUILDTAGS" \
VERSION="v%{version}" \
REVISION="%{git_version}"
# TODO: Fix man-page generation.
#make man
BUILDTAGS="$BUILDTAGS" \
VERSION="v%{version}" \
REVISION="%{git_version}"
make man
cp -r "$PROJECT/bin" bin
@ -121,7 +122,7 @@ cp -r "$PROJECT/bin" bin
pushd bin/
for bin in containerd{,-shim*}
do
install -D -m755 "$bin" "%{buildroot}/%{_sbindir}/$bin"
install -D -m755 "$bin" "%{buildroot}/%{_sbindir}/$bin"
done
# "ctr" is a bit too generic.
install -D -m755 ctr %{buildroot}/%{_sbindir}/%{name}-ctr
@ -135,13 +136,12 @@ echo "# See containerd-config.toml(5) for documentation." >%{buildroot}/%{_sysco
install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
# Man pages.
# TODO: Fix man page generation.
#for file in man/*
#do
# section="${file##*.}"
# install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
#done
#ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{name}-ctr.1
for file in man/*
do
section="${file##*.}"
install -D -m644 "$file" "%{buildroot}/%{_mandir}/man$section/$(basename "$file")"
done
mv %{buildroot}/%{_mandir}/man8/{ctr.8,%{name}-ctr.8}
%fdupes %{buildroot}
@ -166,14 +166,12 @@ install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
%{_sbindir}/containerd
%{_sbindir}/containerd-shim*
%{_unitdir}/%{name}.service
# TODO: Fix man page generation.
#%{_mandir}/man*/%{name}*
#%exclude %{_mandir}/man1/*ctr.1*
%{_mandir}/man*/%{name}*
%exclude %{_mandir}/man8/*ctr.8*
%files ctr
%{_sbindir}/containerd-ctr
# TODO: Fix man page generation.
#%{_mandir}/man1/*ctr.1*
%{_sbindir}/%{name}-ctr
%{_mandir}/man8/%{name}-ctr.8*
%files devel
%license LICENSE