diff --git a/perl-XML-Parser.spec b/perl-XML-Parser.spec
index 8295257..da7d8b3 100644
--- a/perl-XML-Parser.spec
+++ b/perl-XML-Parser.spec
@@ -1,22 +1,20 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-XML-Parser
+Version:        2.34
+Release:        6
+Summary:        A low level Perl module for parsing XML either via trees or streaming
 
-Summary: A low level Perl module for parsing XML either via trees or streaming.
-Name: perl-XML-Parser
-Version: 2.34
-Release: 6
-License: distributable
-Group: Applications/CPAN
-Source0: XML-Parser-%{version}.tar.gz
-Url: http://search.cpan.org/search?query=XML%3A%3AParser
-BuildRoot: %{_tmppath}/perl-XML-Parser-buildroot/
-BuildRequires: perl >= 2:5.8.0
-BuildRequires: perl-libwww-perl
-BuildRequires: perl-URI
-BuildRequires: expat-devel
-Requires: perl >= 2:5.8.0
-Requires: perl-libwww-perl
-Requires: perl-URI
-Requires: expat
+Group:          Development/Libraries
+License:        GPL or Artistic
+Url:            http://search.cpan.org/dist/XML-Parser/
+Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 2:5.8.0
+BuildRequires:  expat-devel
+# The script LWPExternEnt.pl is loaded by Parser.pm
+BuildRequires:  perl(LWP), perl(URI)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(LWP), perl(URI)
 
 %description
 This module provides ways to parse XML documents. It is built on top
@@ -29,41 +27,42 @@ parse call. They can also be given as extra arguments to the parse
 methods, in which case they override options given at XML::Parser
 creation time.
 
+
 %prep
 %setup -q -n XML-Parser-%{version} 
+chmod 644 samples/{canonical,xml*}
+%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' samples/{canonical,xml*}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-# XXX: expedite to get build moving.  run the test, but accept it may have failures
-make test || :
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w $RPM_BUILD_ROOT/*
+
+%check || :
+make test
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%install
-rm -rf $RPM_BUILD_ROOT
-make install
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
-
-find $RPM_BUILD_ROOT/usr -type f -print | 
-	sed "s@^$RPM_BUILD_ROOT@@g" | 
-	grep -v perllocal.pod | 
-	grep -v "\.packlist" > XML-Parser-%{version}-filelist
-if [ "$(cat XML-Parser-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
-
-%files -f XML-Parser-%{version}-filelist
+%files
 %defattr(-,root,root,-)
-%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/XML/Parser
-%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/XML/Parser
+%{perl_vendorarch}/XML/
+%{perl_vendorarch}/auto/XML/
+%{_mandir}/man3/*.3*
+
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Thu Apr 21 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.34-6
+- #155619
+- Bring up to date with current Fedora.Extras perl spec template.
 
 * Sun Aug 08 2004 Alan Cox <alan@redhat.com> 2.34-5
 - runtime requires expat
@@ -96,7 +95,8 @@ fi
 - description update
 
 * Tue Jun  4 2002 Chip Turner <cturner@redhat.com>
-- properly claim directories owned by package so they are removed when package is removed
+- properly claim directories owned by package so they are removed when
+  package is removed
 
 * Wed Jan 09 2002 Tim Powers <timp@redhat.com>
 - automated rebuild