diff --git a/perl-TimeDate.spec b/perl-TimeDate.spec
index 1ddcf7b..7185b48 100644
--- a/perl-TimeDate.spec
+++ b/perl-TimeDate.spec
@@ -1,18 +1,18 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-TimeDate
+Version:        1.16
+Epoch:          1
+Release:        3
+Summary:        A Perl module for time and date manipulation
 
-Summary: A Perl module for time and date manipulation.
-Name: perl-TimeDate
-Version: 1.16
-Epoch: 1
-Release: 3
-License: distributable
-Group: Applications/CPAN
-Source0: TimeDate-%{version}.tar.gz
-Url: http://search.cpan.org/search?query=timedate&mode=all
-BuildRoot: %{_tmppath}/perl-TimeDate-buildroot/
-BuildRequires: perl >= 0:5.00503
-Requires: perl >= 0:5.00503
-BuildArch: noarch
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/TimeDate/
+Source0:   http://www.cpan.org/authors/id/G/GB/GBARR/TimeDate-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module includes a number of smaller modules suited for
@@ -21,42 +21,38 @@ Date::Format and Date::Parse modules can display and read times and
 dates in various formats, providing a more reliable interface to
 textual representations of points in time.
 
-# Provide perl-specific find-{provides,requires}.
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires /usr/lib/rpm/find-requires.perl
 
 %prep
 %setup -q -n TimeDate-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-make test
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+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/*
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%check || :
+make test
 
-find $RPM_BUILD_ROOT/usr -type f -print | 
-	sed "s@^$RPM_BUILD_ROOT@@g" | 
-	grep -v perllocal.pod | 
-	grep -v "\.packlist" > TimeDate-%{version}-filelist
-if [ "$(cat TimeDate-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files 
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Date/
+%{perl_vendorlib}/Time/
+%{_mandir}/man3/*.3*
 
-%files -f TimeDate-%{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:1.16-3
+- Bring up to date with current Fedora.Extras perl spec template. (#155914)
 
 * Wed Sep 22 2004 Chip Turner <cturner@redhat.com> 1:1.16-2
 - rebuild