diff --git a/.gitignore b/.gitignore index 81fae30..3ffbf0a 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ XML-LibXML-1.70.tar.gz /XML-LibXML-2.0205.tar.gz /XML-LibXML-2.0206.tar.gz /XML-LibXML-2.0207.tar.gz +/XML-LibXML-2.0208.tar.gz diff --git a/XML-LibXML-2.0206-Use-pkgconfig-instead-of-Alien-Libxml2.patch b/XML-LibXML-2.0208-Use-pkgconfig-instead-of-Alien-Libxml2.patch similarity index 63% rename from XML-LibXML-2.0206-Use-pkgconfig-instead-of-Alien-Libxml2.patch rename to XML-LibXML-2.0208-Use-pkgconfig-instead-of-Alien-Libxml2.patch index ee10e18..ce64127 100644 --- a/XML-LibXML-2.0206-Use-pkgconfig-instead-of-Alien-Libxml2.patch +++ b/XML-LibXML-2.0208-Use-pkgconfig-instead-of-Alien-Libxml2.patch @@ -1,6 +1,6 @@ -diff -up XML-LibXML-2.0206/Makefile.PL.orig XML-LibXML-2.0206/Makefile.PL ---- XML-LibXML-2.0206/Makefile.PL.orig 2020-09-15 10:00:42.000000000 +0200 -+++ XML-LibXML-2.0206/Makefile.PL 2020-11-30 15:54:20.965335954 +0100 +diff -up XML-LibXML-2.0208/Makefile.PL.orig XML-LibXML-2.0208/Makefile.PL +--- XML-LibXML-2.0208/Makefile.PL.orig 2022-09-30 09:47:44.807934522 +0200 ++++ XML-LibXML-2.0208/Makefile.PL 2022-09-30 09:49:19.192599793 +0200 @@ -17,15 +17,31 @@ use warnings; require 5.008001; @@ -36,13 +36,22 @@ diff -up XML-LibXML-2.0206/Makefile.PL.orig XML-LibXML-2.0206/Makefile.PL "Config" => 0, "ExtUtils::MakeMaker" => 0, ); -@@ -71,7 +87,8 @@ my %prereqs = ( - my %xsbuild = ( +@@ -68,15 +84,12 @@ my %prereqs = ( + "warnings" => 0, + ); + +-my %xsbuild_concat = ( ++my %xsbuild = ( DEFINE => '-DHAVE_UTF8', OBJECT => '$(O_FILES)', -- Alien::Base::Wrapper->mm_args, + LIBS => $libs, + INC => $inc, ); +-my %xsbuild = Alien::Base::Wrapper->mm_args; # Might contain a definition of DEFINE, must thus concatenate. +-while (my ($k, $v) = each %xsbuild_concat) { +- my $base_val = $xsbuild{$k}; +- $xsbuild{$k} = (defined($base_val) ? ($base_val . ' ' . $v) : $v); +-} my %WriteMakefileArgs = ( + "NAME" => "XML::LibXML", diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index fdbcbf2..4029e4c 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -7,18 +7,18 @@ Name: perl-XML-LibXML # https://bugzilla.redhat.com/show_bug.cgi?id=469480 # it might not be needed anymore # this module is maintained, the other is not -Version: 2.0207 -Release: 7%{?dist} +Version: 2.0208 +Release: 1%{?dist} Epoch: 1 Summary: Perl interface to the libxml2 library -License: (GPL+ or Artistic) and MIT +License: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND MIT URL: https://metacpan.org/release/XML-LibXML Source0: https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-%{version}.tar.gz # Fix parsing ampersand entities in SAX interface, CPAN RT#131498, # posted to the upstream. Patch0: XML-LibXML-2.0202-Parse-an-ampersand-entity-in-SAX-interface.patch # To reduce dependencies replace Alien::Libxml2 with pkg-config -Patch1: XML-LibXML-2.0206-Use-pkgconfig-instead-of-Alien-Libxml2.patch +Patch1: XML-LibXML-2.0208-Use-pkgconfig-instead-of-Alien-Libxml2.patch BuildRequires: coreutils BuildRequires: findutils BuildRequires: glibc-common @@ -192,6 +192,9 @@ fi %{_libexecdir}/%{name} %changelog +* Fri Sep 30 2022 Jitka Plesnikova - 1:2.0208-1 +- 2.0208 bump + * Fri Jul 22 2022 Fedora Release Engineering - 1:2.0207-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 6c35f25..64cb342 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (XML-LibXML-2.0207.tar.gz) = 86bf4200c800e1295161c3217892398dbc65e107ad1a3df8ea7f237350ba67d88ad7b18ab7123e647053a8721bc13a8959ddb101fdc6de18dcaef02c0f0f5b58 +SHA512 (XML-LibXML-2.0208.tar.gz) = b8407359b9111b43247cc57b6e9e54c4e99402c9b7e939e49beb752be8fd1ce0e31a98e07dd5d1f7eaa7e37aae25571c38a14792f9e5a64c1533a0387c71423d