From 462502ddf7e1a3234a5680a32af03ed0aedf5fe8 Mon Sep 17 00:00:00 2001 From: Robin Norwood Date: Wed, 24 Oct 2007 20:59:54 +0000 Subject: [PATCH] update to latest release. Remove unused patches. Clean up spec file. --- perl-XML-LibXML-1.53-nosaxinst.patch | 10 ---- perl-XML-LibXML-1.56-noextern.patch | 22 -------- perl-XML-LibXML-1.62-undef-test-fix.patch | 14 ----- perl-XML-LibXML.spec | 65 ++++++++++++----------- 4 files changed, 34 insertions(+), 77 deletions(-) delete mode 100644 perl-XML-LibXML-1.53-nosaxinst.patch delete mode 100644 perl-XML-LibXML-1.56-noextern.patch delete mode 100644 perl-XML-LibXML-1.62-undef-test-fix.patch diff --git a/perl-XML-LibXML-1.53-nosaxinst.patch b/perl-XML-LibXML-1.53-nosaxinst.patch deleted file mode 100644 index 28640a5..0000000 --- a/perl-XML-LibXML-1.53-nosaxinst.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- XML-LibXML-1.53/Makefile.PL.nosax 2002-10-21 11:09:52.000000000 -0400 -+++ XML-LibXML-1.53/Makefile.PL 2002-10-21 11:10:10.000000000 -0400 -@@ -162,7 +162,6 @@ - sub MY::install { - package MY; - my $script = shift->SUPER::install(@_); -- $script =~ s/install :: (.*)$/install :: $1 install_sax_driver/m; - $script .= <<"INSTALL"; - - install_sax_driver : diff --git a/perl-XML-LibXML-1.56-noextern.patch b/perl-XML-LibXML-1.56-noextern.patch deleted file mode 100644 index 83cbd32..0000000 --- a/perl-XML-LibXML-1.56-noextern.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- XML-LibXML-1.56/LibXML.xs.extern 2004-02-27 13:15:10.000000000 -0500 -+++ XML-LibXML-1.56/LibXML.xs 2004-02-27 13:15:29.000000000 -0500 -@@ -70,13 +70,13 @@ - extern int xmlSubstituteEntitiesDefaultVal; - #define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal - #else --LIBXML_DLL_IMPORT extern int xmlDoValidityCheckingDefaultValue; --LIBXML_DLL_IMPORT extern int xmlSubstituteEntitiesDefaultValue; -+LIBXML_DLL_IMPORT int xmlDoValidityCheckingDefaultValue; -+LIBXML_DLL_IMPORT int xmlSubstituteEntitiesDefaultValue; - #endif --LIBXML_DLL_IMPORT extern int xmlGetWarningsDefaultValue; --LIBXML_DLL_IMPORT extern int xmlKeepBlanksDefaultValue; --LIBXML_DLL_IMPORT extern int xmlLoadExtDtdDefaultValue; --LIBXML_DLL_IMPORT extern int xmlPedanticParserDefaultValue; -+LIBXML_DLL_IMPORT int xmlGetWarningsDefaultValue; -+LIBXML_DLL_IMPORT int xmlKeepBlanksDefaultValue; -+LIBXML_DLL_IMPORT int xmlLoadExtDtdDefaultValue; -+LIBXML_DLL_IMPORT int xmlPedanticParserDefaultValue; - - #define TEST_PERL_FLAG(flag) \ - SvTRUE(perl_get_sv(flag, FALSE)) ? 1 : 0 diff --git a/perl-XML-LibXML-1.62-undef-test-fix.patch b/perl-XML-LibXML-1.62-undef-test-fix.patch deleted file mode 100644 index a1302db..0000000 --- a/perl-XML-LibXML-1.62-undef-test-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up XML-LibXML-1.62/t/03doc.t.BAD XML-LibXML-1.62/t/03doc.t ---- XML-LibXML-1.62/t/03doc.t.BAD 2007-09-03 11:54:24.000000000 -0400 -+++ XML-LibXML-1.62/t/03doc.t 2007-09-03 11:54:41.000000000 -0400 -@@ -206,8 +206,8 @@ use XML::LibXML::Common qw(:libxml); - ok($pi); - ok($pi->nodeType, XML_PI_NODE); - ok($pi->nodeName, "foo"); -- ok( $pi->textContent, undef); -- ok( $pi->getData, undef); -+ ok( $pi->textContent, ""); -+ ok( $pi->getData, ""); - $pi->setData(q(bar&)); - ok( $pi->getData, q(bar&)); - ok($pi->textContent, q(bar&)); diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec index 2e2911c..56e982b 100644 --- a/perl-XML-LibXML.spec +++ b/perl-XML-LibXML.spec @@ -1,40 +1,34 @@ -%{!?perl_vendorarch: %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch)} +Name: perl-XML-LibXML +Version: 1.65 +Release: 1%{?dist} +Summary: Perl interface to the libxml2 library -Summary: XML-LibXML Perl module -Name: perl-XML-LibXML -Version: 1.62001 -Release: 2%{?dist}.3 -License: GPL+ or Artistic -Group: Development/Libraries -URL: http://search.cpan.org/dist/XML-LibXML/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl >= 2:5.8.0 -Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }') -Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }') -Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }') -Requires: perl(:MODULE_COMPAT_%(perl -MConfig -e 'print $Config{version}')) -Source0: http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXML-1.62001.tar.gz -Patch0: perl-XML-LibXML-1.62-undef-test-fix.patch -BuildRequires: perl-XML-LibXML-Common perl-XML-SAX perl-XML-NamespaceSupport -BuildRequires: libxml2-devel -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(Test::More) -Requires: perl-XML-LibXML-Common perl-XML-SAX perl-XML-NamespaceSupport +Group: Development/Libraries +License: GPL+ or Artistic +URL: http://search.cpan.org/dist/XML-LibXML/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }') +Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }') +Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }') +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source0: http://www.cpan.org/authors/id/P/PA/PAJAS/XML-LibXML-%{version}.tar.gz +BuildRequires: perl(XML::LibXML::Common), perl(XML::SAX), perl(XML::NamespaceSupport) +BuildRequires: perl(ExtUtils::MakeMaker), perl(Test::More) +BuildRequires: libxml2-devel %description -%{summary}. +This module implements a Perl interface to the GNOME libxml2 library +which provides interfaces for parsing and manipulating XML files. This +module allows Perl programmers to make use of the highly capable +validating XML parser and the high performance DOM implementation. %prep - -#Note hardcoded version # here, because XML-LibXML-1.62001.tar.gz -#contains a dir called XML-LibXML-1.62 - -%setup -q -n XML-LibXML-1.62 -%patch0 -p1 +%setup -q -n XML-LibXML-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" SKIP_SAX_INSTALL=1 perl Makefile.PL INSTALLDIRS=vendor -make OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -46,7 +40,11 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +for i in Changes; do + /usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i +done + +%check make test %clean @@ -73,6 +71,11 @@ fi %{_mandir}/man3/*.3* %changelog +* Wed Oct 24 2007 Robin Norwood - 1.65-1 +- Update to latest CPAN release: 1.65 +- patch0 no longer needed +- various spec file cleanups + * Wed Oct 17 2007 Tom "spot" Callaway - 1.62001-2.3 - fix stupid test