From 58f79e9a9451160aeb50d948e20c9868f185e16e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 17 Aug 2022 13:00:26 -0500 Subject: [PATCH] 1.1.36, re-enable python. --- libxslt-1.1.26-utf8-docs.patch | 103 --------------------------------- libxslt.spec | 26 +++++---- sources | 2 +- 3 files changed, 15 insertions(+), 116 deletions(-) delete mode 100644 libxslt-1.1.26-utf8-docs.patch diff --git a/libxslt-1.1.26-utf8-docs.patch b/libxslt-1.1.26-utf8-docs.patch deleted file mode 100644 index 537718f..0000000 --- a/libxslt-1.1.26-utf8-docs.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- 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 - -- * 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 -@@ -2112,7 +2112,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 - -@@ -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, -- 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 - -@@ -3497,7 +3497,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 -@@ -3507,7 +3507,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 - -@@ -3648,7 +3648,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 - -@@ -5036,7 +5036,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 - -@@ -5119,7 +5119,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 ---- 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: -- - 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) -@@ -472,7 +472,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 -@@ -485,7 +485,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 7471cdb..2895985 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -1,7 +1,7 @@ Name: libxslt Summary: Library providing the Gnome XSLT engine -Version: 1.1.35 -Release: 3%{?dist} +Version: 1.1.36 +Release: 1%{?dist} License: MIT URL: https://gitlab.gnome.org/GNOME/libxslt @@ -18,9 +18,8 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.6.27 # Fedora specific patches Patch0: multilib.patch -Patch1: libxslt-1.1.26-utf8-docs.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1467435 -Patch2: multilib2.patch +Patch1: multilib2.patch %description This C library allows to transform XML files into other XML files @@ -37,7 +36,7 @@ Requires: libgpg-error-devel%{?_isa} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%if 0 +%if 1 # Upstream package has not been ported to Python 3. I have # converted this section so it could be used to compile the # Python 3 bindings one day once that has happened, but @@ -69,7 +68,7 @@ chmod 644 python/tests/* autoreconf -vfi #export PYTHON=%{__python3} #%configure --disable-static --disable-silent-rules --with-python -%configure --disable-static --disable-silent-rules --with-python=no --with-crypto=no +%configure --disable-static --disable-silent-rules --with-python=yes --with-crypto=no %make_build %install @@ -86,7 +85,7 @@ rm -vrf %{buildroot}%{_docdir} %files %license Copyright -%doc AUTHORS ChangeLog NEWS README FEATURES +%doc AUTHORS NEWS README FEATURES %{_bindir}/xsltproc %{_libdir}/libxslt.so.* %{_libdir}/libexslt.so.* @@ -100,8 +99,8 @@ rm -vrf %{buildroot}%{_docdir} %doc doc/EXSLT/libexslt-refs.xml %doc %{_mandir}/man3/libxslt.3* %doc %{_mandir}/man3/libexslt.3* -%doc doc/*.html doc/html doc/*.gif doc/*.png -%doc doc/images +#%doc doc/*.html doc/html doc/*.gif doc/*.png +#%doc doc/images %doc doc/tutorial %doc doc/tutorial2 #%%doc doc/EXSLT @@ -117,11 +116,11 @@ rm -vrf %{buildroot}%{_docdir} %{_libdir}/pkgconfig/libexslt.pc %{_bindir}/xslt-config -%if 0 +%if 1 %files -n python3-libxslt -%{python3_sitearch}/libxslt.py* +%{python3_sitelib}/libxslt.py* %{python3_sitearch}/libxsltmod.so -%{python3_sitearch}/__pycache__/nbd*.py* +%{python3_sitelib}/__pycache__/libxslt* %doc python/libxsltclass.txt %doc python/tests/*.py %doc python/tests/*.xml @@ -129,6 +128,9 @@ rm -vrf %{buildroot}%{_docdir} %endif %changelog +* Wed Aug 17 2022 Gwyn Ciesla - 1.1.36-1 +- 1.1.36 + * Thu Jul 21 2022 Fedora Release Engineering - 1.1.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 7604a38..3f71d72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxslt-1.1.35.tar.xz) = 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96 +SHA512 (libxslt-1.1.36.tar.xz) = 8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8