From df588fc4945faf7f1fae8d32488519075fa0c26a Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 5 Nov 2010 10:46:24 +0000
Subject: [PATCH] Rebuild for libxml2 2.7.8 in Rawhide

- Rebuild for libxml2 2.7.8 in Rawhide
- Move recoding of documentation from %install to %prep
- Use %{?perl_default_filter}
- Use standard %install idiom
---
 perl-XML-LibXML.spec | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/perl-XML-LibXML.spec b/perl-XML-LibXML.spec
index 5776b38..46df0d8 100644
--- a/perl-XML-LibXML.spec
+++ b/perl-XML-LibXML.spec
@@ -1,8 +1,8 @@
 Name:           perl-XML-LibXML
-# NOTE: also update perl-XML-LibXSLT to the same version, see
+# NOTE: also update perl-XML-LibXSLT to a compatible version, see
 # https://bugzilla.redhat.com/show_bug.cgi?id=469480
 Version:        1.70
-Release:        5%{?dist}
+Release:        6%{?dist}
 # Epoch set when version went from 1.62001 to 1.65
 Epoch:          1
 Summary:        Perl interface to the libxml2 library
@@ -24,6 +24,9 @@ BuildRequires:  libxml2-devel
 Provides:       perl-XML-LibXML-Common = %{version}
 Obsoletes:      perl-XML-LibXML-Common <= 0.13
 
+# Don't "provide" private Perl libs
+%{?perl_default_filter}
+
 %description
 This module implements a Perl interface to the GNOME libxml2 library
 which provides interfaces for parsing and manipulating XML files. This
@@ -33,24 +36,22 @@ validating XML parser and the high performance DOM implementation.
 %prep
 %setup -q -n XML-LibXML-%{version}
 
+for i in Changes; do
+  /usr/bin/iconv -f iso8859-1 -t utf-8 $i > $i.conv && /bin/mv -f $i.conv $i
+done
+
 %build
 %{__perl} Makefile.PL SKIP_SAX_INSTALL=1 INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+make pure_install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} ';' 2>/dev/null
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-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
 
@@ -79,6 +80,12 @@ fi
 %{_mandir}/man3/*.3*
 
 %changelog
+* Fri Nov  5 2010 Paul Howarth <paul@city-fan.org> - 1:1.70-6
+- Rebuild for libxml2 2.7.8 in Rawhide
+- Move recoding of documentation from %%install to %%prep
+- Use %%{?perl_default_filter}
+- Use standard %%install idiom
+
 * Fri May 07 2010 Marcela Maslanova <mmaslano@redhat.com> - 1:1.70-5
 - Mass rebuild with perl-5.12.0