From f4ecdf133b906826035df50d67497a8953d1cf15 Mon Sep 17 00:00:00 2001 From: paragn Date: Thu, 28 Oct 2010 09:09:14 +0530 Subject: [PATCH] - Patch from Paul Howarth for converting files to utf8 (#226088) --- libxslt-1.1.24-utf8-docs.patch | 112 +++++++++++++++++++++++++++++++++ libxslt.spec | 12 ++-- 2 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 libxslt-1.1.24-utf8-docs.patch diff --git a/libxslt-1.1.24-utf8-docs.patch b/libxslt-1.1.24-utf8-docs.patch new file mode 100644 index 0000000..167a42f --- /dev/null +++ b/libxslt-1.1.24-utf8-docs.patch @@ -0,0 +1,112 @@ +--- ChangeLog 2008-05-13 16:51:58.000000000 +0100 ++++ ChangeLog 2009-03-03 16:52:30.000000000 +0000 +@@ -174,7 +174,7 @@ + + Thu Aug 23 11:47:20 CEST 2007 Daniel Veillard + +- * libexslt/date.c: apply patch from Björn Wiberg fixing build on AIX ++ * libexslt/date.c: apply patch from Björn Wiberg fixing build on AIX + and closing bug #332173 + + Fri Aug 3 15:49:26 CEST 2007 Daniel Veillard +@@ -2002,7 +2002,7 @@ + Tue Feb 17 11:29:15 CET 2004 Daniel Veillard + + * libxslt/templates.c: applied patch from #134588 provided by +- Mariano Suárez-Alvarez, attribute text node without doc. ++ Mariano Suárez-Alvarez, attribute text node without doc. + + Mon Feb 16 15:55:57 CET 2004 Daniel Veillard + +@@ -2010,7 +2010,7 @@ + preparing release of 1.1.3 + * libxslt/attrvt.c libxslt/xsltInternals.h: cleanup + +-2004-02-15 Tomasz KÅ‚oczko ++2004-02-15 Tomasz Kłoczko + + * libxslt.m4: small fix: added missing [] quotation macro name + defined in AC_DEFUN(). Fix is neccessary for aclocal from automake +@@ -3011,7 +3011,7 @@ + * python/generator.py: fixed a problem in the generator where + the way functions are remapped as methods on classes was + not symetric and dependant on python internal hash order, +- as reported by Stéphane Bidoul ++ as reported by Stéphane Bidoul + * libexslt/strings.c: attempt at fixing an object type pbm + * libxslt/triodef.h: update for OpenVMS from libxml2 + +@@ -3387,7 +3387,7 @@ + + Thu Jan 2 23:23:30 CET 2003 Daniel Veillard + +- * libexslt/strings.c: applied patch from Jörg Walter to provide ++ * libexslt/strings.c: applied patch from Jörg Walter to provide + URI escaping and unescaping functions. + + Thu Dec 26 15:43:31 CET 2002 Daniel Veillard +@@ -3397,7 +3397,7 @@ + + Mon Dec 23 15:43:59 CET 2002 Daniel Veillard + +- * python/libxslt.c: patch from Stéphane Bidoul for Python 2.1 ++ * python/libxslt.c: patch from Stéphane Bidoul for Python 2.1 + + Sun Dec 22 22:54:04 CET 2002 Daniel Veillard + +@@ -3538,7 +3538,7 @@ + + Sun Nov 24 13:58:48 CET 2002 Daniel Veillard + +- * python/libxsl.py: updated with new version from Stéphane Bidoul ++ * python/libxsl.py: updated with new version from Stéphane Bidoul + + Sat Nov 23 22:49:08 CET 2002 Igor Zlatkovic + +@@ -4926,7 +4926,7 @@ + + Mon Nov 26 11:21:27 CET 2001 Daniel Veillard + +- * libxslt/pattern.c: fixing bug #64044 reported by Gero Meißner, ++ * libxslt/pattern.c: fixing bug #64044 reported by Gero Meißner, + template matches compilation was failing to skip blanks bewteen + consecutive predicates + +@@ -5009,7 +5009,7 @@ + + Tue Oct 30 19:32:08 CET 2001 Daniel Veillard + +- * configure.in: applied patches from David Härdeman closing ++ * configure.in: applied patches from David Härdeman closing + bug #62891 + + Tue Oct 30 15:25:19 CET 2001 Daniel Veillard +--- NEWS 2008-05-13 16:50:14.000000000 +0100 ++++ NEWS 2009-03-03 16:56:44.000000000 +0000 +@@ -242,7 +242,7 @@ + + + 1.1.4: Feb 23 2004: +- - bugfixes: attributes without doc (Mariano Suárez-Alvarez), problem with ++ - bugfixes: attributes without doc (Mariano Suárez-Alvarez), problem with + Yelp, extension problem + - display extension modules (Steve Little) + - Windows compilation patch (Mark Vadoc), Mingw (Mikhail Grushinskiy) +@@ -402,7 +402,7 @@ + + + 1.0.24: Jan 14 2003: +- - bug fixes: imported global varables, python bindings (Stéphane Bidoul), ++ - bug fixes: imported global varables, python bindings (Stéphane Bidoul), + EXSLT memory leak (Charles Bozeman), namespace generation on + xsl:attribute, space handling with imports (Daniel Stodden), + extension-element-prefixes (Josh Parsons), comments within xsl:text (Matt +@@ -415,7 +415,7 @@ + - fix the API generation scripts + - API to provide the sorting routines (Richard Jinks) + - added XML description of the EXSLT API +- - added ESXLT URI (un)escaping (Jörg Walter) ++ - added ESXLT URI (un)escaping (Jörg Walter) + - Some memory leaks have been found and fixed + - document() now support fragment identifiers in URIs + diff --git a/libxslt.spec b/libxslt.spec index 4075450..b13cab3 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -13,6 +13,7 @@ BuildRequires: libgcrypt-devel # Fedora specific patch Patch0: multilib.patch +Patch1: libxslt-1.1.24-utf8-docs.patch %description This C library allows to transform XML files into other XML files @@ -48,13 +49,7 @@ with XPath functions written in Python. %prep %setup -q %patch0 -p1 - -# Convert to utf-8 -for file in NEWS ChangeLog doc/tutorial2/libxslt_pipes.xml; do - iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ - touch -r $file $file.new && \ - mv $file.new $file -done +%patch1 -p0 chmod 644 python/tests/* @@ -116,6 +111,9 @@ make tests %doc python/tests/*.xsl %changelog +* Mon Oct 25 2010 Parag Nemade - 1.1.26-5 +- Patch from Paul Howarth for converting files to utf8 (#226088) + * Tue Oct 05 2010 Parag Nemade - 1.1.26-4 - Merge-review cleanup (#226088)