From be07741dbd28bd89d60e6424019706cf8030678e Mon Sep 17 00:00:00 2001 From: kukuk <> Date: Dec 02 2022 13:06:41 +0000 Subject: Update rpm2docserv to version 20221129.a10bb7c / rev 12 via SR 1039537 https://build.opensuse.org/request/show/1039537 by user kukuk + dimstar_suse - Update vendor dir - Require /usr/bin/mandoc: we rely on mandoc to render the man pages as html. - Fix building on Leap 15.4 --- diff --git a/.files b/.files index 5c806ea..c0143d8 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 40d2fa5..b1c4911 100644 --- a/.rev +++ b/.rev @@ -119,4 +119,17 @@ 1039297 + + 59302a97acc241f6c572a02a1a8d14ee + 20221129.a10bb7c + + dimstar_suse + - Update vendor dir + +- Require /usr/bin/mandoc: we rely on mandoc to render the man + pages as html. + +- Fix building on Leap 15.4 + 1039537 + diff --git a/.servicemark b/.servicemark index ebeca7c..b0e56a4 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -8b79dba9b75cb5e055b837d3587c80a6 +88e757a197ab598d9dd7391f69b295a7 diff --git a/rpm2docserv.changes b/rpm2docserv.changes index 86d67a4..1cef577 100644 --- a/rpm2docserv.changes +++ b/rpm2docserv.changes @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Fri Dec 2 10:12:16 UTC 2022 - Thorsten Kukuk + +- Update vendor dir + +------------------------------------------------------------------- +Fri Dec 2 09:27:07 UTC 2022 - Dominique Leuenberger + +- Require /usr/bin/mandoc: we rely on mandoc to render the man + pages as html. + +------------------------------------------------------------------- +Thu Dec 1 11:30:46 UTC 2022 - Thorsten Kukuk + +- Fix building on Leap 15.4 + +------------------------------------------------------------------- Thu Dec 1 10:50:58 UTC 2022 - Dominique Leuenberger - Add dependency on cpio: rpm2docserv uses cpio to extract RPMs. diff --git a/rpm2docserv.spec b/rpm2docserv.spec index 643d07b..b8e4add 100644 --- a/rpm2docserv.spec +++ b/rpm2docserv.spec @@ -16,6 +16,10 @@ # +%if ! %{defined _distconfdir} +%define _distconfdir %{_sysconfdir} +%endif + Name: rpm2docserv Version: 20221129.a10bb7c Release: 0 @@ -26,9 +30,10 @@ Source: rpm2docserv-%{version}.tar.xz BuildRequires: sysuser-shadow BuildRequires: sysuser-tools BuildRequires: golang(API) >= 1.18 +Requires: /usr/bin/mandoc Requires: cpio # To re-create: -# git clone https://github.com/Debian/debiman +# git clone https://github.com/thkukuk/rpm2docserv # cd rpm2docserv; make vendor; cd .. # osc service @@ -140,14 +145,22 @@ install -m 644 apache2/* %{buildroot}%{_datadir}/docserv/apache2/ %{_sbindir}/docserv-auxserver %{_unitdir}/docserv-auxserver.service %{_sysusersdir}/system-user-docserv-aux.conf +%if 0%{?suse_version} >= 1599 %{_distconfdir}/default/docserv-auxserver +%else +%config %{_distconfdir}/default/docserv-auxserver +%endif %files -n docserv-minisrv %license LICENSE %{_sbindir}/docserv-minisrv %{_unitdir}/docserv-minisrv.service %{_sysusersdir}/system-user-docserv-srv.conf +%if 0%{?suse_version} >= 1599 %{_distconfdir}/default/docserv-minisrv +%else +%config %{_distconfdir}/default/docserv-minisrv +%endif %files -n docserv-sitemap %license LICENSE