diff --git a/subversion-1.6.5-newlines.patch b/subversion-1.6.5-newlines.patch new file mode 100644 index 0000000..c127665 --- /dev/null +++ b/subversion-1.6.5-newlines.patch @@ -0,0 +1,273 @@ +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 @@ + + --> + +- +- +- +-]> +- + +@@ -119,7 +113,7 @@ + + + +- &newl; ++ + + + +@@ -149,33 +143,33 @@ + + + +- &newl; ++ + + + + +- &space;&space; ++ + + + +- &newl; +- &newl; ++ ++ + + + + + + +- &newl; ++ + + + + +- &space;&space; ++ + + + +- &newl;&newl; ++ + + + +@@ -187,7 +181,7 @@ + + [r + +- ]&space; ++ ] + + + +@@ -195,7 +189,7 @@ + + + +- &newl; ++ + + + +@@ -208,14 +202,14 @@ + + + +- &newl; ++ + +- &tab;*&space; ++ * + + + + +- ++ + + + +@@ -232,7 +226,7 @@ + + + +- &space; ++ + + + +@@ -306,7 +300,7 @@ + + + +- ,&space; ++ , + + + +@@ -324,7 +318,7 @@ + + + +- ,&space; ++ , + + + +@@ -382,23 +376,23 @@ + + + +- ++ + + +- ++ + + +- &tab;&space;&space; ++ + + +- ++ + + + + + + +- &newl; ++ + + + +@@ -420,7 +414,7 @@ + + + +- &newl;&tab;&space;&space; ++ + + + +@@ -449,26 +443,26 @@ + + + +- ++ + + + + + +- ++ + + + + + +- ++ + +- ++ + +- &newl;&newl; ++ + + +- ++ + + + +@@ -485,7 +479,7 @@ + + + +- &newl; ++ + + + +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 @@ + + --> + +- +- +-]> +- + + + +- &space; ++ + + + +@@ -145,7 +140,7 @@ +
  • + + +- &space; ++ + + +
  • +@@ -167,10 +162,10 @@ + + [r] + +- &space; ++ + + +- &space; ++ + + + +@@ -189,14 +184,14 @@ + + + +- ++ + +- ++ + +
    + + +- ++ + +
    + diff --git a/subversion.spec b/subversion.spec index 8b4670d..a989216 100644 --- a/subversion.spec +++ b/subversion.spec @@ -17,7 +17,7 @@ Summary: A Modern Concurrent Version Control System Name: subversion Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 1.1 Group: Development/Tools URL: http://subversion.tigris.org/ @@ -26,6 +26,8 @@ Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el Source5: psvn-init.el +# http://bugs.debian.org/546990 +Patch0: subversion-1.6.5-newlines.patch Patch2: subversion-1.6.0-deplibs.patch Patch3: subversion-1.6.1-rpath.patch Patch6: subversion-1.6.0-pie.patch @@ -144,6 +146,9 @@ constructs found in different places. %prep %setup -q +cd contrib/client-side/svn2cl +%patch0 -p1 -b .newlines +cd ../../.. %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath #patch6 -p1 -b .pie @@ -380,6 +385,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/svn2cl.1* %changelog +* Mon Nov 2 2009 Ville Skyttä - 1.6.5-3 +- Apply svn2cl upstream patch to fix newline issues with libxml2 2.7.4+, + see http://bugs.debian.org/546990 for details. + * Sat Sep 19 2009 Ville Skyttä - 1.6.5-2 - Ship svn2cl and bash completion (#496456). - Add %%defattr to -gnome and -kde.