rpms/svn2cl/F-10 svn2cl-0.11-libxml2-2.7.4-newlines.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 svn2cl.spec, 1.7, 1.8

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/svn2cl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2202

Modified Files:
	.cvsignore sources svn2cl.spec 
Added Files:
	svn2cl-0.11-libxml2-2.7.4-newlines.patch 
Log Message:
* Mon Nov  2 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.11-3
- Apply upstream patch to fix newline issues with libxml2 2.7.4+, see
  http://bugs.debian.org/546990 for details.

* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sun Dec 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.11-1
- 0.11.


svn2cl-0.11-libxml2-2.7.4-newlines.patch:
 svn2cl.xsl   |   64 ++++++++++++++++++++++++++---------------------------------
 svn2html.xsl |   19 ++++++-----------
 2 files changed, 36 insertions(+), 47 deletions(-)

--- NEW FILE svn2cl-0.11-libxml2-2.7.4-newlines.patch ---
diff -up svn2cl-0.11/svn2cl.xsl~ svn2cl-0.11/svn2cl.xsl
--- svn2cl-0.11/svn2cl.xsl~	2008-12-21 17:41:20.000000000 +0200
+++ svn2cl-0.11/svn2cl.xsl	2009-11-02 22:29:34.000000000 +0200
@@ -55,12 +55,6 @@
 
 -->
 
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY tab "&#9;">
- <!ENTITY newl "&#38;#xA;">
- <!ENTITY space "&#32;">
-]>
-
 <xsl:stylesheet
   version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -119,7 +113,7 @@
    </xsl:otherwise>
   </xsl:choose>
   <!-- add newlines at the end of the changelog -->
-  <xsl:text>&newl;</xsl:text>
+  <xsl:text>&#10;</xsl:text>
  </xsl:template>
 
  <!-- format one entry from the log -->
@@ -149,33 +143,33 @@
     <xsl:if test="($prevdate!=$date) or ($prevauthor!=$author)">
      <!-- add newline -->
      <xsl:if test="not(position()=1)">
-      <xsl:text>&newl;</xsl:text>
+      <xsl:text>&#10;</xsl:text>
      </xsl:if>
      <!-- date -->
      <xsl:value-of select="$date" />
      <!-- two spaces -->
-     <xsl:text>&space;&space;</xsl:text>
+     <xsl:text>&#32;&#32;</xsl:text>
      <!-- author's name -->
      <xsl:apply-templates select="author" />
      <!-- two newlines -->
-     <xsl:text>&newl;</xsl:text>
-     <xsl:if test="$separate-daylogs!='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
+     <xsl:text>&#10;</xsl:text>
+     <xsl:if test="$separate-daylogs!='yes'"><xsl:text>&#10;</xsl:text></xsl:if>
     </xsl:if>
    </xsl:when>
    <!-- write the log header -->
    <xsl:otherwise>
     <!-- add newline -->
     <xsl:if test="not(position()=1)">
-     <xsl:text>&newl;</xsl:text>
+     <xsl:text>&#10;</xsl:text>
     </xsl:if>
     <!-- date -->
     <xsl:apply-templates select="date" />
     <!-- two spaces -->
-    <xsl:text>&space;&space;</xsl:text>
+    <xsl:text>&#32;&#32;</xsl:text>
     <!-- author's name -->
     <xsl:apply-templates select="author" />
     <!-- two newlines -->
-    <xsl:text>&newl;&newl;</xsl:text>
+    <xsl:text>&#10;&#10;</xsl:text>
    </xsl:otherwise>
   </xsl:choose>
   <!-- get paths string -->
@@ -187,7 +181,7 @@
    <xsl:if test="$include-rev='yes'">
     <xsl:text>[r</xsl:text>
     <xsl:value-of select="@revision" />
-    <xsl:text>]&space;</xsl:text>
+    <xsl:text>]&#32;</xsl:text>
    </xsl:if>
   </xsl:variable>
   <!-- trim trailing newlines -->
@@ -195,7 +189,7 @@
    <!-- add a line break before the log message -->
    <xsl:choose>
     <xsl:when test="$breakbeforemsg='yes'">
-     <xsl:text>&newl;</xsl:text>
+     <xsl:text>&#10;</xsl:text>
     </xsl:when>
     <xsl:when test="number($breakbeforemsg)&gt;0">
      <xsl:call-template name="newlines">
@@ -208,14 +202,14 @@
    </xsl:call-template>
   </xsl:variable>
   <!-- add newline here if separate-daylogs is in effect -->
-  <xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
+  <xsl:if test="$groupbyday='yes' and $separate-daylogs='yes'"><xsl:text>&#10;</xsl:text></xsl:if>
   <!-- first line is indented (other indents are done in wrap template) -->
-  <xsl:text>&tab;*&space;</xsl:text>
+  <xsl:text>&#9;*&#32;</xsl:text>
   <!-- set up the text to wrap -->
   <xsl:variable name="txt">
    <xsl:value-of select="$rev" />
    <xsl:if test="$paths!=''">
-    <xsl:value-of select="concat($paths,':&space;')" />
+    <xsl:value-of select="concat($paths,':&#32;')" />
    </xsl:if>
    <xsl:value-of select="$msg" />
   </xsl:variable>
@@ -232,7 +226,7 @@
   <xsl:value-of select="substring($date,1,10)" />
   <!-- output time part -->
   <xsl:if test="$groupbyday!='yes'">
-   <xsl:text>&space;</xsl:text>
+   <xsl:text>&#32;</xsl:text>
    <xsl:value-of select="substring($date,12,5)" />
   </xsl:if>
  </xsl:template>
@@ -306,7 +300,7 @@
      <xsl:sort select="normalize-space(.)" data-type="text" />
      <!-- unless we are the first entry, add a comma -->
      <xsl:if test="not(position()=1)">
-      <xsl:text>,&space;</xsl:text>
+      <xsl:text>,&#32;</xsl:text>
      </xsl:if>
      <!-- print the path name -->
      <xsl:call-template name="printpath">
@@ -324,7 +318,7 @@
      <xsl:sort select="normalize-space(.)" data-type="text" />
      <!-- unless we are the first entry, add a comma -->
      <xsl:if test="not(position()=1)">
-      <xsl:text>,&space;</xsl:text>
+      <xsl:text>,&#32;</xsl:text>
      </xsl:if>
      <!-- print the path name -->
      <xsl:value-of select="normalize-space(.)" />
@@ -382,23 +376,23 @@
   <xsl:param name="txt" />
   <xsl:variable name="normtxt" select="normalize-space($txt)" />
   <xsl:choose>
-   <xsl:when test="contains($txt,'&newl;')">
+   <xsl:when test="contains($txt,'&#10;')">
      <!-- text contains newlines, do the first line -->
      <xsl:call-template name="wrap">
-      <xsl:with-param name="txt" select="substring-before($txt,'&newl;')" />
+      <xsl:with-param name="txt" select="substring-before($txt,'&#10;')" />
      </xsl:call-template>
      <!-- print tab -->
-     <xsl:text>&tab;&space;&space;</xsl:text>
+     <xsl:text>&#9;&#32;&#32;</xsl:text>
      <!-- wrap the rest of the text -->
      <xsl:call-template name="wrap">
-      <xsl:with-param name="txt" select="substring-after($txt,'&newl;')" />
+      <xsl:with-param name="txt" select="substring-after($txt,'&#10;')" />
      </xsl:call-template>
    </xsl:when>
    <xsl:when test="(string-length($normtxt) &lt; (($linelen)-9)) or not(contains($normtxt,' '))">
     <!-- this is easy, nothing to do -->
     <xsl:value-of select="$normtxt" />
     <!-- add newline -->
-    <xsl:text>&newl;</xsl:text>
+    <xsl:text>&#10;</xsl:text>
    </xsl:when>
    <xsl:otherwise>
     <!-- find the first line -->
@@ -420,7 +414,7 @@
     <!-- print line -->
     <xsl:value-of select="$line" />
     <!-- print newline and tab -->
-    <xsl:text>&newl;&tab;&space;&space;</xsl:text>
+    <xsl:text>&#10;&#9;&#32;&#32;</xsl:text>
     <!-- wrap the rest of the text -->
     <xsl:call-template name="wrap">
      <xsl:with-param name="txt" select="normalize-space(substring($normtxt,string-length($line)+1))" />
@@ -449,26 +443,26 @@
   <xsl:param name="txt" />
   <xsl:choose>
    <!-- find starting newlines -->
-   <xsl:when test="substring($txt,1,1) = '&newl;'">
+   <xsl:when test="substring($txt,1,1) = '&#10;'">
     <xsl:call-template name="trim-newln">
      <xsl:with-param name="txt" select="substring($txt,2)" />
     </xsl:call-template>
    </xsl:when>
    <!-- find trailing newlines -->
-   <xsl:when test="substring($txt,string-length($txt),1) = '&newl;'">
+   <xsl:when test="substring($txt,string-length($txt),1) = '&#10;'">
     <xsl:call-template name="trim-newln">
      <xsl:with-param name="txt" select="substring($txt,1,string-length($txt)-1)" />
     </xsl:call-template>
    </xsl:when>
    <!-- if the message has paragrapgs, find the first one -->
-   <xsl:when test="$reparagraph='yes' and contains($txt,'&newl;&newl;')">
+   <xsl:when test="$reparagraph='yes' and contains($txt,'&#10;&#10;')">
      <!-- remove newlines from first paragraph -->
-     <xsl:value-of select="normalize-space(substring-before($txt,'&newl;&newl;'))" />
+     <xsl:value-of select="normalize-space(substring-before($txt,'&#10;&#10;'))" />
      <!-- paragraph separator -->
-     <xsl:text>&newl;&newl;</xsl:text>
+     <xsl:text>&#10;&#10;</xsl:text>
      <!-- do the rest of the text -->
      <xsl:call-template name="trim-newln">
-      <xsl:with-param name="txt" select="substring-after($txt,'&newl;&newl;')" />
+      <xsl:with-param name="txt" select="substring-after($txt,'&#10;&#10;')" />
      </xsl:call-template>
    </xsl:when>
    <!-- remove more single newlines -->
@@ -485,7 +479,7 @@
  <!-- insert a number of newlines -->
  <xsl:template name="newlines">
   <xsl:param name="count" />
-  <xsl:text>&newl;</xsl:text>
+  <xsl:text>&#10;</xsl:text>
   <xsl:if test="$count&gt;1">
    <xsl:call-template name="newlines">
     <xsl:with-param name="count" select="($count)-1" />
diff -up svn2cl-0.11/svn2html.xsl~ svn2cl-0.11/svn2html.xsl
--- svn2cl-0.11/svn2html.xsl~	2008-12-21 17:41:20.000000000 +0200
+++ svn2cl-0.11/svn2html.xsl	2009-11-02 22:30:11.000000000 +0200
@@ -47,11 +47,6 @@
 
 -->
 
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY newl "&#38;#xA;">
- <!ENTITY space "&#32;">
-]>
-
 <xsl:stylesheet
   version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -134,7 +129,7 @@
      <li class="changelog_entry">
       <!-- date -->
       <span class="changelog_date"><xsl:value-of select="$date" /></span>
-      <xsl:text>&space;</xsl:text>
+      <xsl:text>&#32;</xsl:text>
       <!-- author's name -->
       <span class="changelog_author"><xsl:apply-templates select="author" /></span>
      </li>
@@ -145,7 +140,7 @@
     <li class="changelog_entry">
      <!-- date -->
      <span class="changelog_date"><xsl:apply-templates select="date" /></span>
-     <xsl:text>&space;</xsl:text>
+     <xsl:text>&#32;</xsl:text>
      <!-- author's name -->
      <span class="changelog_author"><xsl:apply-templates select="author" /></span>
     </li>
@@ -167,10 +162,10 @@
    <span class="changelog_revision">
     <a id="r{@revision}" href="{$revlink}">[r<xsl:value-of select="@revision" />]</a>
    </span>
-   <xsl:text>&space;</xsl:text>
+   <xsl:text>&#32;</xsl:text>
    <!-- get paths string -->
    <span class="changelog_files"><xsl:apply-templates select="paths" /></span>
-   <xsl:text>&space;</xsl:text>
+   <xsl:text>&#32;</xsl:text>
    <!-- get message text -->
    <xsl:variable name="msg">
     <xsl:call-template name="trim-newln">
@@ -189,14 +184,14 @@
  <xsl:template name="newlinestobr">
   <xsl:param name="txt" />
   <xsl:choose>
-   <xsl:when test="contains($txt,'&newl;')">
+   <xsl:when test="contains($txt,'&#10;')">
     <!-- text contains newlines, do the first line -->
-    <xsl:value-of select="substring-before($txt,'&newl;')" />
+    <xsl:value-of select="substring-before($txt,'&#10;')" />
     <!-- print new line -->
     <br />
     <!-- wrap the rest of the text -->
     <xsl:call-template name="newlinestobr">
-     <xsl:with-param name="txt" select="substring-after($txt,'&newl;')" />
+     <xsl:with-param name="txt" select="substring-after($txt,'&#10;')" />
     </xsl:call-template>
    </xsl:when>
    <xsl:otherwise>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/svn2cl/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	6 Apr 2008 17:58:03 -0000	1.6
+++ .cvsignore	12 Nov 2009 20:57:27 -0000	1.7
@@ -1 +1 @@
-svn2cl-0.10.tar.gz
+svn2cl-0.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/svn2cl/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	6 Apr 2008 17:58:03 -0000	1.6
+++ sources	12 Nov 2009 20:57:27 -0000	1.7
@@ -1 +1 @@
-f947d168b72530d3e11452f326955cf2  svn2cl-0.10.tar.gz
+55eb88893a6d5330cadb39e59d53e0f8  svn2cl-0.11.tar.gz


Index: svn2cl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svn2cl/F-10/svn2cl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- svn2cl.spec	6 Apr 2008 17:53:50 -0000	1.7
+++ svn2cl.spec	12 Nov 2009 20:57:27 -0000	1.8
@@ -1,12 +1,14 @@
 Name:           svn2cl
-Version:        0.10
-Release:        1
+Version:        0.11
+Release:        3
 Summary:        Create a ChangeLog from a Subversion log
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://ch.tudelft.nl/~arthur/svn2cl/
 Source0:        http://ch.tudelft.nl/~arthur/svn2cl/%{name}-%{version}.tar.gz
+# http://bugs.debian.org/546990
+Patch0:         %{name}-0.11-libxml2-2.7.4-newlines.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,6 +24,7 @@ constructs found in different places.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh
 
 
@@ -52,24 +55,34 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.10-1
+* Mon Nov  2 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.11-3
+- Apply upstream patch to fix newline issues with libxml2 2.7.4+, see
+  http://bugs.debian.org/546990 for details.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.11-1
+- 0.11.
+
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.10-1
 - 0.10, drop disttag.
 
-* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
+* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9-1
 - 0.9.
 
-* Thu Oct 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8-1
+* Thu Oct 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8-1
 - 0.8.
 - Add (empty) %%build section.
 
-* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7-2
+* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7-2
 - Rebuild.
 
-* Fri Jun  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1
+* Fri Jun  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7-1
 - 0.7.
 
-* Fri Apr  7 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-1
+* Fri Apr  7 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-1
 - First FE build (#186632).
 
-* Thu Mar 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-0.1
+* Thu Mar 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-0.1
 - First build.