rpms/moin/FC-4 moin-1.3.5-xml_newline.patch, NONE, 1.1 moin.spec, 1.4, 1.5

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/moin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15661/FC-4

Modified Files:
	moin.spec 
Added Files:
	moin-1.3.5-xml_newline.patch 
Log Message:
Include fix for XML output from Tommy Reynolds.


moin-1.3.5-xml_newline.patch:

--- NEW FILE moin-1.3.5-xml_newline.patch ---
diff -Naupr moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py moin-1.3.5/MoinMoin/formatter/xml_docbook.py
--- moin-1.3.5.orig/MoinMoin/formatter/xml_docbook.py	2005-07-26 20:46:50.000000000 +0200
+++ moin-1.3.5/MoinMoin/formatter/xml_docbook.py	2005-12-19 10:06:34.000000000 +0100
@@ -98,7 +98,7 @@ class Formatter(FormatterBase):
 
     def linebreak(self, preformatted=1):
         if preformatted:
-            self.text('\\n')
+            self.text('\n')
         else:
             #this should not happen
             #self.text('CRAP') 


Index: moin.spec
===================================================================
RCS file: /cvs/extras/rpms/moin/FC-4/moin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- moin.spec	16 Aug 2005 14:25:26 -0000	1.4
+++ moin.spec	19 Dec 2005 09:14:11 -0000	1.5
@@ -1,16 +1,17 @@
 Summary: MoinMoin is a Python clone of WikiWiki
 Name:    moin
 Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Internet
 URL:     http://moinmoin.wikiwikiweb.de/
 Source0: http://dl.sf.net/moin/moin-%{version}.tar.gz
 Source1: README-rpm
-Patch:   moin-1.3.5-config.patch
+Patch0:  moin-1.3.5-config.patch
+Patch1:  moin-1.3.5-xml_newline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-BuildRequires: python
+BuildRequires: python, dos2unix
 
 %description
 A WikiWikiWeb is a collaborative hypertext environment, with an emphasis on
@@ -21,7 +22,10 @@
 
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+# This is required, as patch gets confused by the ^Ms otherwise
+dos2unix MoinMoin/formatter/xml_docbook.py
+%patch1 -p1 -b .xml_newline
 
 
 %build
@@ -48,6 +52,10 @@
 
 
 %changelog
+* Sun Dec 18 2005 Tommy Reynolds <Tommy.Reynolds at MegaCoder.com> 1.3.5-3
+- Remove extraneous '\' from XML output, so that <screen>..</screen>
+  does not generate '\' 'n' outside of any markup.
+
 * Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.3.5-2
 - Fix python modules path from _libdir to _prefix/lib so that build works on
   64bit systems too.