From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. fb37a3c271b07a7b18321d2defdb8b1c9e6f58a0 Date: Thu, 26 Jan 2023 13:18:23 +0000 Message-ID: <4P2h9C5svzz2xcR@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8171939185876772703==" List-Id: --===============8171939185876772703== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via fb37a3c271b07a7b18321d2defdb8b1c9e6f58a0 (commit) via 2a6da3c7fb33b1d5aed3738fd87221fb259d18eb (commit) from fad28aebc167034eb9d7ef658ac509322cbe7d14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fb37a3c271b07a7b18321d2defdb8b1c9e6f58a0 Author: Stefan Schantl Date: Wed Jan 25 21:30:22 2023 +0100 iputils: Generate manpages again. =20 This requires the latest version of the XSL stylesheets. =20 Fixes #13021. =20 Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer commit 2a6da3c7fb33b1d5aed3738fd87221fb259d18eb Author: Stefan Schantl Date: Wed Jan 25 21:30:21 2023 +0100 docbook-xsl: Update to 1.79.2 =20 This is an update to the latest available version. =20 Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: docbook-xsl/Makefile | 52 --- docbook-xsl/docbook-xsl.nm | 57 +-- .../patches/docbook-xsl-list-item-body.patch | 110 ------ docbook-xsl/patches/docbook-xsl-mandir.patch | 19 - docbook-xsl/patches/docbook-xsl-marginleft.patch | 100 ------ docbook-xsl/patches/docbook-xsl-newmethods.patch | 394 -------------------= -- .../docbook-xsl-non-constant-expressions.patch | 25 -- docbook-xsl/patches/docbook-xsl-pagesetup.patch | 227 ------------ iputils/iputils.nm | 6 +- 9 files changed, 39 insertions(+), 951 deletions(-) delete mode 100644 docbook-xsl/Makefile delete mode 100644 docbook-xsl/patches/docbook-xsl-list-item-body.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-mandir.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-marginleft.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-newmethods.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-non-constant-expressions.= patch delete mode 100644 docbook-xsl/patches/docbook-xsl-pagesetup.patch Difference in files: diff --git a/docbook-xsl/Makefile b/docbook-xsl/Makefile deleted file mode 100644 index 281656dec..000000000 --- a/docbook-xsl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -BINDIR =3D /usr/bin -DESTDIR =3D ..overridden in spec file.. - -all: install - -install: install-xsl install-img install-extensions install-misc install-epub - -install-xsl: - mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,templ= ate,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website} - cp common/*.dtd $(DESTDIR)/common - cp common/*.ent $(DESTDIR)/common - cp common/*.xml $(DESTDIR)/common - cp common/*.xsl $(DESTDIR)/common - cp eclipse/*.xsl $(DESTDIR)/eclipse - cp fo/*.xml $(DESTDIR)/fo - cp fo/*.xsl $(DESTDIR)/fo - cp html/*.xml $(DESTDIR)/html - cp html/*.xsl $(DESTDIR)/html - cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp - cp javahelp/*.xsl $(DESTDIR)/javahelp - cp lib/*.xsl $(DESTDIR)/lib - cp template/*.xsl $(DESTDIR)/template - cp xhtml/*.xsl $(DESTDIR)/xhtml - cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1 - cp manpages/*.xsl $(DESTDIR)/manpages - cp profiling/*.xsl $(DESTDIR)/profiling - cp highlighting/*.xml $(DESTDIR)/highlighting - cp highlighting/*.xsl $(DESTDIR)/highlighting - cp roundtrip/*.xml $(DESTDIR)/roundtrip - cp roundtrip/*.xsl $(DESTDIR)/roundtrip - cp roundtrip/*.dtd $(DESTDIR)/roundtrip - cp website/*.xsl $(DESTDIR)/website - -install-img: - mkdir -p $(DESTDIR)/images/callouts - cp images/*.gif $(DESTDIR)/images - cp images/*.png $(DESTDIR)/images - cp images/*.svg $(DESTDIR)/images - cp images/callouts/*.png $(DESTDIR)/images/callouts - cp images/callouts/*.gif $(DESTDIR)/images/callouts - cp images/callouts/*.svg $(DESTDIR)/images/callouts - -install-extensions: - mkdir -p $(DESTDIR)/extensions - cp -r extensions/* $(DESTDIR)/extensions - -install-epub: - mkdir -p $(DESTDIR)/epub - cp -r epub/* ${DESTDIR}/epub - -install-misc: - cp VERSION $(DESTDIR) diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm index 028fdc8b6..f3a7a11b2 100644 --- a/docbook-xsl/docbook-xsl.nm +++ b/docbook-xsl/docbook-xsl.nm @@ -4,12 +4,12 @@ ############################################################################= ### =20 name =3D docbook-xsl -version =3D 1.76.1 -release =3D 3 +version =3D 1.79.2 +release =3D 1 arch =3D noarch =20 groups =3D Applications/Text -url =3D http://docbook.sourceforge.net/projects/xsl/ +url =3D https://docbook.sourceforge.net/projects/xsl/ license =3D GPLv2+ summary =3D Norman Walsh's XSL stylesheets for DocBook XML. =20 @@ -18,29 +18,36 @@ description other formats, such as HTML, FO, and XHMTL. They are highly customizable. end =20 -source_dl =3D http://prdownloads.sourceforge.net/docbook/ +source_dl =3D https://github.com/docbook/xslt10-stylesheets/releases/downloa= d/release/%{version}/ =20 -sources =3D\ - %{thisapp}.tar.bz2 \ - %{name}-doc-%{version}.tar.bz2 +sources =3D %{thisapp}.tar.bz2 =20 build - prepare_cmds - cp -av %{DIR_SOURCE}/Makefile %{DIR_APP}/Makefile + build + # Nothing to do. end =20 - build =3D # empty + install + # Create directory layout. + mkdir -pv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{versio= n} =20 - make_install_targets +=3D\ - BINDIR=3D%{BUILDROOT}/usr/bin \ - DESTDIR=3D%{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version} + # Install catalog files. + cp -avf [[:lower:]]* %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-styleshee= ts-%{version}/ + cp -avf VERSION %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{= version}/VERSION.xsl + + ln -svf VERSION.xsl \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/VERSION + ln -svf xsl-ns-stylesheets-%{version} \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets + + # Don't ship install shell script. + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh =20 - install_cmds # Remove buggy extensions. - rm -rfv %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/ext= ensions/* + rm -rfv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/ex= tensions/* =20 # Remove unneeded tool for .epub formats. - rm -rvf %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/epub + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/ep= ub end end =20 @@ -62,25 +69,33 @@ packages # Install catalog files. /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/cat= alog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog =20 /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/cat= alog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog =20 /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/cat= alog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog =20 /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/cat= alog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog + + /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog + + /usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog end =20 script preun # Uninstall catalog files. /usr/bin/xmlcatalog --noout --del \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/cat= alog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/= catalog end end end diff --git a/docbook-xsl/patches/docbook-xsl-list-item-body.patch b/docbook-x= sl/patches/docbook-xsl-list-item-body.patch deleted file mode 100644 index a3d3819f7..000000000 --- a/docbook-xsl/patches/docbook-xsl-list-item-body.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.= xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200 -@@ -248,9 +248,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -=20 -@@ -446,10 +454,18 @@ - - - -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -=20 - -@@ -925,9 +941,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -951,9 +975,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1141,9 +1173,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/docbook-xsl/patches/docbook-xsl-mandir.patch b/docbook-xsl/patch= es/docbook-xsl-mandir.patch deleted file mode 100644 index d2c5a7e47..000000000 --- a/docbook-xsl/patches/docbook-xsl-mandir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/man= pages/other.xsl ---- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000= +0200 -+++ docbook-xsl-1.76.1/manpages/other.xsl 2011-09-06 17:17:07.973737258 +0200 -@@ -595,7 +595,14 @@ manvolnum - Note: - (soelim stub) - -- -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/docbook-xsl/patches/docbook-xsl-marginleft.patch b/docbook-xsl/p= atches/docbook-xsl-marginleft.patch deleted file mode 100644 index 31c1b84d2..000000000 --- a/docbook-xsl/patches/docbook-xsl-marginleft.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.= xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -324,7 +324,7 @@ - - - -- -+ - - - -@@ -333,15 +333,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -350,15 +342,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -372,17 +356,7 @@ -=20 - 1em - -- -- -- -- -- -- -- -- + -- -- -- -+ - -=20 - -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.= xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -133,8 +133,8 @@ - - always - -- -- -+ -+ - false - - -diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pa= gesetup.xsl ---- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 += 0200 -+++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 -@@ -30,16 +30,7 @@ - -=20 - -- -- -- -- -- -- -- - -- -- -- -+ - -=20 - diff --git a/docbook-xsl/patches/docbook-xsl-newmethods.patch b/docbook-xsl/p= atches/docbook-xsl-newmethods.patch deleted file mode 100644 index debc51ba0..000000000 --- a/docbook-xsl/patches/docbook-xsl-newmethods.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/= docbook.xsl ---- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 += 0200 -+++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -26,6 +26,7 @@ - - - -+ - - - -@@ -44,6 +45,7 @@ - - - -+ - - - -diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtb= l.xsl ---- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -0,0 +1,293 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ " -+ -+ " is not a known unit. Applying scaling factor of 1 in= stead. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ entering adjustColumnWidths( -+ -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ total relative widths =3D ( -+ -+ ) -+ -+ -+ total absolute widths =3D ( -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ all widths are absolute -+ -+ -+ -+ -+ -+ all widths are relative -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ result =3D ( -+ -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ first.bad.column =3D ( -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ =3D $first.bad.column]"> -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 1* -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/ta= ble.xsl ---- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +02= 00 -+++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -5,7 +5,8 @@ - xmlns:xtbl=3D"xalan://com.nwalsh.xalan.Table" - xmlns:lxslt=3D"http://xml.apache.org/xslt" - xmlns:ptbl=3D"http://nwalsh.com/xslt/ext/xsltproc/python/Ta= ble" -- exclude-result-prefixes=3D"doc stbl xtbl lxslt ptbl" -+ xmlns:dtbl=3D"http://docbook.sourceforge.net/dtbl" -+ exclude-result-prefixes=3D"doc stbl xtbl lxslt ptbl dtbl" - version=3D'1.0'> -=20 - -@@ -365,6 +366,9 @@ - - -+ -+ -+ - - - -@@ -389,6 +393,9 @@ - - -+ -+ -+ - - - -diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/l= ib/dumpfragment.xsl ---- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.0000000= 00 +0100 -+++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0= 200 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ =3D" -+ -+ " -+ -+ -+ -+ < -+ -+ > -+ -+ </ -+ > -+ -+ -+ -diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/pa= ram.xsl ---- docbook-xsl-1.76.0-orig/html/param.xsl 2010-08-31 09:27:22.000000000 +02= 00 -+++ docbook-xsl-1.76.0/html/param.xsl 2010-09-06 11:01:07.916914161 +0200 -@@ -68,6 +68,7 @@ div.annotation-close { position: absolut - http://docbook.sourceforge.net/release/images/annot-close.png - http://docbook.sourceforge.net/= release/images/annot-open.png -=20 -+ - - http://docbook.sourceforge.net/release/script/AnchorPosition.js h= ttp://docbook.sourceforge.net/release/script/PopupWindow.js -=20 diff --git a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch b= /docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch deleted file mode 100644 index 0c3f6be74..000000000 --- a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.= xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:38:36.000000000 +0200 -@@ -23,8 +23,8 @@ - always - always - -- -- -+ -+ - false - center - -@@ -334,8 +334,8 @@ set toc,title - bold - always - -- -- -+ -+ - 0pt - - diff --git a/docbook-xsl/patches/docbook-xsl-pagesetup.patch b/docbook-xsl/pa= tches/docbook-xsl-pagesetup.patch deleted file mode 100644 index e4d77ffca..000000000 --- a/docbook-xsl/patches/docbook-xsl-pagesetup.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pa= gesetup.xsl ---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 += 0200 -+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 -@@ -1697,36 +1697,81 @@ - - -=20 -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ -=20 - - -@@ -2021,36 +2066,81 @@ - - - -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ -=20 - - diff --git a/iputils/iputils.nm b/iputils/iputils.nm index d5ea1b477..5bcab41e9 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -31,9 +31,9 @@ build meson ninja openssl-devel + docbook-xsl <=3D 1.79.2 end =20 - # Generate manpages with docbook build %{meson} %{meson_build} @@ -44,10 +44,10 @@ build =20 # Create ping6 as a symlink to ping ln -svf ping %{BUILDROOT}%{bindir}/ping6 - #ln -svf ping.8 %{BUILDROOT}%{mandir}/man/man8/ping6.8 + ln -svf ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8 =20 ln -svf tracepath %{BUILDROOT}%{bindir}/tracepath6 - #ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man/man8/tracepath6.8 + ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8 =20 # This currently does not work in pakfire #setcap cap_net_admin=3Dep %{BUILDROOT}%{bindir}/ping hooks/post-receive -- IPFire 3.x development tree --===============8171939185876772703==--