[libvirt] [PATCH 1/2] docs: news: remove sed sorcery

Ján Tomko jtomko at redhat.com
Wed Jul 17 14:37:06 UTC 2019


Set a default namespace in the stylesheet instead.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 docs/Makefile.am   | 8 +-------
 docs/news-html.xsl | 4 +++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1cfa38dc80..bc2fd6ea42 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -236,9 +236,6 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \
 	$(AM_V_GEN)$(PERL) $(srcdir)/hvsupport.pl $(top_srcdir)/src > $@ \
 		|| { rm $@ && exit 1; }
 
-# xsltproc seems to add the xmlns="" attribute to random output elements:
-# use sed to strip it out, as leaving it there triggers XML errors during
-# further transformation steps
 news.html.in: \
 	  $(srcdir)/news.xml \
 	  $(srcdir)/news-html.xsl
@@ -246,10 +243,7 @@ news.html.in: \
 	    $(srcdir)/news-html.xsl \
 	    $(srcdir)/news.xml \
 	  >$@-tmp \
-	    || { rm -f $@-tmp; exit 1; }; \
-	  sed 's/ xmlns=""//g' $@-tmp >$@ \
-	    || { rm -f $@-tmp; exit 1; }; \
-	  rm -f $@-tmp
+	    || { rm -f $@-tmp; exit 1; };
 EXTRA_DIST += \
 	$(srcdir)/news.xml \
 	$(srcdir)/news.rng \
diff --git a/docs/news-html.xsl b/docs/news-html.xsl
index 2b02578cb9..6763a71fa3 100644
--- a/docs/news-html.xsl
+++ b/docs/news-html.xsl
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
 
   <!-- This XSLT stylesheet can be applied to the XML version of the release
-- 
2.20.1




More information about the libvir-list mailing list