diff --git a/perl-Inline.spec b/perl-Inline.spec
index 6667f12..5b783d6 100644
--- a/perl-Inline.spec
+++ b/perl-Inline.spec
@@ -1,15 +1,18 @@
-%define _use_internal_dependency_generator 0
-
-Name: perl-Inline
-Version: 0.44
-Release: 15
-Summary: Inline Perl module
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/search?mode=module&query=Inline
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503 perl-Parse-RecDescent
-Source0: Inline-%{version}.tar.gz
+Name:           perl-Inline
+Version:        0.44
+Release:        15
+Summary:        Inline Perl module
+
+Group:          Development/Libraries
+License:        GPL or Artistic
+Url:            http://search.cpan.org/dist/Inline/
+Source0:      http://www.cpan.org/authors/id/I/IN/INGY/Inline-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Parse::RecDescent)
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 The Inline module allows you to put source code from other programming
@@ -30,40 +33,39 @@ once. Code that is Inlined into distributed modules (like on the CPAN)
 will get compiled when the module is installed, so the end user will
 never notice the compilation time.
 
+
 %prep
 %setup -q -n Inline-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null
-make
-make test
+%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+make %{?_smp_mflags}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 %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
-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 {} \;
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > Inline-%{version}-filelist
-if [ "$(cat Inline-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
+%files
+%defattr(-,root,root,-)
+%{perl_vendorlib}/Inline*
+%{perl_vendorlib}/auto/
+%{_mandir}/man3/*.3*
 
-%files -f Inline-%{version}-filelist
-%defattr(-,root,root)
 
 %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> - 0.44-15
+- BuildArch correction (noarch). (#155811)
+- Bring up to date with current Fedora.Extras perl spec template.
 
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt