From f8445b1a142f851c09031cbca3abe8f7d81d9b5c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 20 Mar 2011 03:56:10 +0100 Subject: [PATCH] ChangeLog: fix character encoding Restore timestamps for patched documentation files --- ...cs.patch => libxslt-1.1.26-utf8-docs.patch | 39 +++++++------------ libxslt.spec | 18 +++++++-- 2 files changed, 29 insertions(+), 28 deletions(-) rename libxslt-1.1.24-utf8-docs.patch => libxslt-1.1.26-utf8-docs.patch (82%) diff --git a/libxslt-1.1.24-utf8-docs.patch b/libxslt-1.1.26-utf8-docs.patch similarity index 82% rename from libxslt-1.1.24-utf8-docs.patch rename to libxslt-1.1.26-utf8-docs.patch index 167a42f..537718f 100644 --- a/libxslt-1.1.24-utf8-docs.patch +++ b/libxslt-1.1.26-utf8-docs.patch @@ -1,6 +1,6 @@ ---- ChangeLog 2008-05-13 16:51:58.000000000 +0100 -+++ ChangeLog 2009-03-03 16:52:30.000000000 +0000 -@@ -174,7 +174,7 @@ +--- libxslt-1.1.26/ChangeLog.utf8 2009-07-24 10:16:49.000000000 +0200 ++++ libxslt-1.1.26/ChangeLog 2011-03-20 03:28:28.142684293 +0100 +@@ -284,7 +284,7 @@ Thu Aug 23 11:47:20 CEST 2007 Daniel Veillard @@ -9,7 +9,7 @@ and closing bug #332173 Fri Aug 3 15:49:26 CEST 2007 Daniel Veillard -@@ -2002,7 +2002,7 @@ +@@ -2112,7 +2112,7 @@ Tue Feb 17 11:29:15 CET 2004 Daniel Veillard * libxslt/templates.c: applied patch from #134588 provided by @@ -18,16 +18,7 @@ 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 @@ +@@ -3121,7 +3121,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, @@ -36,7 +27,7 @@ * libexslt/strings.c: attempt at fixing an object type pbm * libxslt/triodef.h: update for OpenVMS from libxml2 -@@ -3387,7 +3387,7 @@ +@@ -3497,7 +3497,7 @@ Thu Jan 2 23:23:30 CET 2003 Daniel Veillard @@ -45,7 +36,7 @@ URI escaping and unescaping functions. Thu Dec 26 15:43:31 CET 2002 Daniel Veillard -@@ -3397,7 +3397,7 @@ +@@ -3507,7 +3507,7 @@ Mon Dec 23 15:43:59 CET 2002 Daniel Veillard @@ -54,7 +45,7 @@ Sun Dec 22 22:54:04 CET 2002 Daniel Veillard -@@ -3538,7 +3538,7 @@ +@@ -3648,7 +3648,7 @@ Sun Nov 24 13:58:48 CET 2002 Daniel Veillard @@ -63,7 +54,7 @@ Sat Nov 23 22:49:08 CET 2002 Igor Zlatkovic -@@ -4926,7 +4926,7 @@ +@@ -5036,7 +5036,7 @@ Mon Nov 26 11:21:27 CET 2001 Daniel Veillard @@ -72,7 +63,7 @@ template matches compilation was failing to skip blanks bewteen consecutive predicates -@@ -5009,7 +5009,7 @@ +@@ -5119,7 +5119,7 @@ Tue Oct 30 19:32:08 CET 2001 Daniel Veillard @@ -81,9 +72,9 @@ 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 @@ +--- libxslt-1.1.26/NEWS.utf8 2009-09-24 16:38:20.000000000 +0200 ++++ libxslt-1.1.26/NEWS 2011-03-20 03:27:37.440684281 +0100 +@@ -312,7 +312,7 @@ 1.1.4: Feb 23 2004: @@ -92,7 +83,7 @@ Yelp, extension problem - display extension modules (Steve Little) - Windows compilation patch (Mark Vadoc), Mingw (Mikhail Grushinskiy) -@@ -402,7 +402,7 @@ +@@ -472,7 +472,7 @@ 1.0.24: Jan 14 2003: @@ -101,7 +92,7 @@ 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 @@ +@@ -485,7 +485,7 @@ - fix the API generation scripts - API to provide the sorting routines (Richard Jinks) - added XML description of the EXSLT API diff --git a/libxslt.spec b/libxslt.spec index 4f4b120..83b333d 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -1,7 +1,7 @@ Summary: Library providing the Gnome XSLT engine Name: libxslt Version: 1.1.26 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz @@ -13,7 +13,7 @@ BuildRequires: libgcrypt-devel # Fedora specific patch Patch0: multilib.patch -Patch1: libxslt-1.1.24-utf8-docs.patch +Patch1: libxslt-1.1.26-utf8-docs.patch %description This C library allows to transform XML files into other XML files @@ -50,14 +50,20 @@ with XPath functions written in Python. %prep %setup -q %patch0 -p1 -%patch1 -p0 +%patch1 -p1 -b .utf8 +# Now fix up the timestamps of patched docs files +# ChangeLog needs to be retouched before gzip as well +# since timestamp affects output +touch -r ChangeLog.utf8 ChangeLog +gzip -9 ChangeLog +touch -r ChangeLog.utf8 ChangeLog.gz +touch -r NEWS.utf8 NEWS chmod 644 python/tests/* %build %configure --disable-static make %{?_smp_mflags} -gzip -9 ChangeLog %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" @@ -112,6 +118,10 @@ make tests %doc python/tests/*.xsl %changelog +* Sun Mar 20 2011 Michel Salim - 1.1.26-8 +- ChangeLog: fix character encoding +- Restore timestamps for patched documentation files + * Tue Feb 08 2011 Fedora Release Engineering - 1.1.26-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild