diff --git a/perl-Digest-HMAC.spec b/perl-Digest-HMAC.spec
index 3b27c16..2ab7ea4 100644
--- a/perl-Digest-HMAC.spec
+++ b/perl-Digest-HMAC.spec
@@ -1,20 +1,18 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-Digest-HMAC
+Version:        1.01
+Release:        14
+Summary:        Digest-HMAC Perl module
 
-Name: perl-Digest-HMAC
-Version: 1.01
-Release: 15
-Summary: Digest-HMAC Perl module
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/search?mode=module&query=Digest%3a%3aHMAC
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: Digest-HMAC-%{version}.tar.gz
-BuildArch: noarch
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/Digest-HMAC/
+Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Digest-HMAC-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: perl-Digest-SHA1
-BuildRequires: perl(Digest::MD5)
-Requires: perl(Digest::SHA1) perl(Digest::MD5)
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::MD5), perl(Digest::SHA1)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 HMAC is used for message integrity checks between two parties that
@@ -25,40 +23,37 @@ RFC 2104.
 HMAC follow the common Digest:: interface, but the constructor takes
 the secret key and the name of some other simple Digest:: as argument.
 
+
 %prep
 %setup -q -n Digest-HMAC-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
+
+%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 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
-eval `perl '-V:installarchlib'`
-mkdir -p $RPM_BUILD_ROOT/$installarchlib
-make install
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%files
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Digest/
+%{_mandir}/man3/*.3*
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > Digest-HMAC-%{version}-filelist
-if [ "$(cat Digest-HMAC-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
-
-%files -f Digest-HMAC-%{version}-filelist
-%defattr(-,root,root)
 
 %changelog
-* Wed Mar 30 2005 Warren Togami <wtogami@redhat.com>
-- remove brp-compress
+* Mon Apr 25 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-14
+- Bring up to date with current Fedora.Extras perl spec template. (#155912)
 
 * Wed Sep 22 2004 Chip Turner <cturner@redhat.com> 1.01-13
 - rebuild