From 70ee979d9de6b5dea4d20f809f1f2909c98729c141bc4b0c1e844e34aa617d15 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Wed, 23 Oct 2019 20:36:10 +0000 Subject: [PATCH] Accepting request 742256 from home:kukuk:branches:Base:System - Add man.conf to container variant OBS-URL: https://build.opensuse.org/request/show/742256 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=57 --- busybox.changes | 5 +++++ busybox.spec | 10 +++++++--- man.conf | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 man.conf diff --git a/busybox.changes b/busybox.changes index 788e0fa..ea1cda8 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 22:35:14 CEST 2019 - kukuk@suse.de + +- Add man.conf to container variant + ------------------------------------------------------------------- Tue Sep 10 07:27:49 UTC 2019 - Jan Engelhardt diff --git a/busybox.spec b/busybox.spec index 8604383..f979109 100644 --- a/busybox.spec +++ b/busybox.spec @@ -28,6 +28,7 @@ Source1: BusyBox.1 Source2: busybox.config Source3: busybox-static.config Source4: busybox-container.config +Source5: man.conf # other patches Patch: busybox.install.patch Provides: useradd_or_adduser_dep @@ -99,9 +100,11 @@ install -m 0644 busybox.links %{buildroot}%{_datadir}/busybox install -m 0644 busybox-container.links %{buildroot}%{_datadir}/busybox install applets/install.sh %{buildroot}%{_bindir}/busybox.install install busybox-container.install %{buildroot}%{_bindir}/busybox-container.install -install -m 0755 busybox %{buildroot}/%{_bindir} -install -m 0755 busybox-static %{buildroot}/%{_bindir} -install -m 0755 busybox-container %{buildroot}/%{_bindir} +install -m 0755 busybox %{buildroot}%{_bindir} +install -m 0755 busybox-static %{buildroot}%{_bindir} +install -m 0755 busybox-container %{buildroot}%{_bindir} +install -d %{buildroot}%{_sysconfdir} +install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/ install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 @@ -120,6 +123,7 @@ install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 %files container %license LICENSE +%{_sysconfdir}/man.conf %{_bindir}/busybox-container %{_bindir}/busybox-container.install %{_datadir}/busybox/busybox-container.links diff --git a/man.conf b/man.conf new file mode 100644 index 0000000..8db5c9b --- /dev/null +++ b/man.conf @@ -0,0 +1 @@ +MANPATH /usr/share/man