[tidyp] Fix mangling of output file names (#725651)

Paul Howarth pghmcfc at fedoraproject.org
Thu Aug 11 21:00:00 UTC 2011


commit 6228c1ca436dae2b1b359f76d7f5de19db180bb7
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Aug 11 21:57:47 2011 +0100

    Fix mangling of output file names (#725651)
    
    This fix was sent upstream but no new release appears to be
    forthcoming so I'll patch this one.
    Sent upstream: https://github.com/petdance/tidyp/pull/18

 tidy-outfile-raw.patch |   14 ++++++++++++++
 tidyp.spec             |   20 ++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/tidy-outfile-raw.patch b/tidy-outfile-raw.patch
new file mode 100644
index 0000000..0cac5a0
--- /dev/null
+++ b/tidy-outfile-raw.patch
@@ -0,0 +1,14 @@
+--- tidy/src/config.c.orig	2008-06-18 21:18:54.000000000 +0100
++++ tidy/src/config.c	2011-07-26 13:19:45.688344233 +0100
+@@ -919,7 +919,10 @@
+         TidyBuffer inbuf;            /* Set up input source */
+         tidyBufInitWithAllocator( &inbuf, doc->allocator );
+         tidyBufAttach( &inbuf, (byte*)optval, TY_(tmbstrlen)(optval)+1 );
+-        doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, ASCII );
++        if (optId == TidyOutFile)
++            doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, RAW );
++        else
++            doc->config.cfgIn = TY_(BufferInput)( doc, &inbuf, ASCII );
+         doc->config.c = GetC( &doc->config );
+ 
+         status = option->parser( doc, option );
diff --git a/tidyp.spec b/tidyp.spec
index 483eecc..0c35f81 100644
--- a/tidyp.spec
+++ b/tidyp.spec
@@ -1,13 +1,14 @@
 Summary:	Clean up and pretty-print HTML/XHTML/XML
 Name:		tidyp
 Version:	1.02
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	W3C
 Group:		Applications/Text
 Url:		http://www.tidyp.com/
 Source0:	http://github.com/downloads/petdance/tidyp/tidyp-%{version}.tar.gz
+Patch0:		tidy-outfile-raw.patch
 Patch1:		tidyp-cflags.patch
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 Requires:	libtidyp%{?_isa} = %{version}-%{release}
 
 %description
@@ -32,6 +33,10 @@ Development files for libtidyp.
 %prep
 %setup -q
 
+# Fix mangling of output file names (#725651)
+# Sent upstream: https://github.com/petdance/tidyp/pull/18
+%patch0 -p1
+
 # Remove unwanted CFLAGS
 %patch1 -p1
 
@@ -77,11 +82,14 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/libtidyp.la
 
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Thu Aug 11 2011 Paul Howarth <paul at city-fan.org> 1.02-5
+- fix mangling of output file names (#725651)
+
+* Wed Feb  9 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.02-4
+- rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Wed Sep 29 2010 jkeating - 1.02-3
-- Rebuilt for gcc bug 634757
+* Wed Sep 29 2010 Jesse Keating <jkeating at redhat.com> 1.02-3
+- rebuilt for gcc bug (#634757)
 
 * Fri Jul 23 2010 Paul Howarth <paul at city-fan.org> 1.02-2
 - re-jig for Fedora submission


More information about the scm-commits mailing list