From c6b067d0c30670fe6aeb537f711092999818423b Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 23 Apr 2008 19:39:59 +0000
Subject: [PATCH] Fix generation of NEWS file

---
 ChangeLog        |  4 ++++
 docs/Makefile.am |  4 ++--
 docs/news.xsl    | 17 +++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5917c09ed..04a097f202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 23 15:38:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* docs/Makefile.am, docs/news.xsl: Fix generation of NEWS file
+
 Wed Apr 23 13:43:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* docs/page.xsl: Fix link to wiki when href_base is set
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 8cb5f06bc6..c42c1f868c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -113,9 +113,9 @@ libvirt-api.xml libvirt-refs.xml: apibuild.py \
 		$(srcdir)/../src/*.h $(srcdir)/../src/*.c
 	-(./apibuild.py)
 
-$(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html
+$(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in
 	-@(if [ -x $(XSLTPROC) ] ; then \
-	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html > $(top_builddir)/NEWS ; fi );
+	  $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in > $(top_builddir)/NEWS ; fi );
 
 clean-local:
 	rm -f *~ *.bak *.hierarchy *.signals *-unused.txt
diff --git a/docs/news.xsl b/docs/news.xsl
index 0a23762a45..47431510af 100644
--- a/docs/news.xsl
+++ b/docs/news.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xhtml="http://www.w3.org/1999/xhtml"
                 version="1.0">
   <xsl:output method="text" encoding="ISO-8859-1"/>
 
@@ -12,27 +11,29 @@
        http://libvirt.org/news.html
 
 </xsl:text>
-    <xsl:apply-templates select="//xhtml:div[@id='content2']//xhtml:h3[1]/.."/>
+    <xsl:apply-templates select="html/body/*"/>
   </xsl:template>
-  <xsl:template match="xhtml:h3">
+  <xsl:template match="h1"/>
+
+  <xsl:template match="h3">
     <xsl:text>
 </xsl:text>
     <xsl:apply-templates/>
     <xsl:text>:
 </xsl:text>
   </xsl:template>
-  <xsl:template match="xhtml:ul">
-    <xsl:apply-templates select=".//xhtml:li"/>
+  <xsl:template match="ul">
+    <xsl:apply-templates select=".//li"/>
     <xsl:text>
 </xsl:text>
   </xsl:template>
-  <xsl:template match="xhtml:li">
+  <xsl:template match="li">
     <xsl:text>   - </xsl:text>
     <xsl:value-of select="."/>
     <xsl:text>
 </xsl:text>
   </xsl:template>
-  <xsl:template match="xhtml:a">
+  <xsl:template match="a">
     <xsl:value-of select="."/>
     <xsl:text> at
 </xsl:text>
@@ -40,7 +41,7 @@
     <xsl:text>
 </xsl:text>
   </xsl:template>
-  <xsl:template match="xhtml:p">
+  <xsl:template match="p">
   </xsl:template>
 </xsl:stylesheet>