diff --git a/perl-BSD-Resource.spec b/perl-BSD-Resource.spec
index c19ffd9..ae8ca79 100644
--- a/perl-BSD-Resource.spec
+++ b/perl-BSD-Resource.spec
@@ -1,55 +1,56 @@
-%define _use_internal_dependency_generator 0
-
-Name: perl-BSD-Resource
-Version: 1.24
-Release: 1
-Summary: BSD process resource limit and priority functions
-License: distributable
-Group: Development/Libraries
-URL: http://search.cpan.org/~jhi/BSD-Resource-1.24/Resource.pm
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: perl >= 0:5.00503
-Source0: http://search.cpan.org/CPAN/authors/id/J/JH/JHI/BSD-Resource-%{version}.tar.gz
+Name:           perl-BSD-Resource
+Version:        1.24
+Release:        2
+Summary:        BSD process resource limit and priority functions
+
+Group:          Development/Libraries
+License:        GPL or Artistic
+URL:            http://search.cpan.org/dist/BSD-Resource/
+Source0: http://www.cpan.org/authors/id/J/JH/JHI/BSD-Resource-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 A module providing an interface for testing and setting process limits
 and priorities.
 
+
 %prep
 %setup -q -n BSD-Resource-%{version} 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor
-make
-make test || /bin/true
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %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 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/*
 
-[ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
+%check || :
+make test
 
-find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT/usr -type f -print | \
-	sed "s@^$RPM_BUILD_ROOT@@g" | \
-	grep -v perllocal.pod | \
-	grep -v "\.packlist" > BSD-Resource-%{version}-filelist
-if [ "$(cat BSD-Resource-%{version}-filelist)X" = "X" ] ; then
-    echo "ERROR: EMPTY FILE LIST"
-    exit -1
-fi
 
-%files -f BSD-Resource-%{version}-filelist
-%defattr(-,root,root)
-%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/BSD
-%dir %{_libdir}/perl5/vendor_perl/%(perl -MConfig -le 'print "$Config{version}/$Config{archname}"')/auto/BSD
+%files
+%defattr(-,root,root,-)
+%{perl_vendorarch}/BSD/
+%{perl_vendorarch}/auto/BSD/
+%{_mandir}/man3/*.3*
 
 
 %changelog
+* Sat Apr  2 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.24-2
+- spec cleanup
+- License corrected
+
 * Thu Mar 31 2005 Warren Togami <wtogami@redhat.com> 1.24-1
 - 1.24