diff --git a/perl-BSD-Resource-1.28-fix-setrlimit-test.patch b/perl-BSD-Resource-1.28-fix-setrlimit-test.patch
new file mode 100644
index 0000000..d371051
--- /dev/null
+++ b/perl-BSD-Resource-1.28-fix-setrlimit-test.patch
@@ -0,0 +1,11 @@
+--- BSD-Resource-1.28/t/setrlimit.t.orig	2007-06-30 16:46:03.000000000 -0500
++++ BSD-Resource-1.28/t/setrlimit.t	2007-06-30 16:46:13.000000000 -0500
+@@ -18,7 +18,7 @@
+   my ($oldlim, $oldhard) = @_;
+ 
+   my $newlim =
+-      ($oldlim == RLIM_INFINITY) ? $oldlim : $oldlim ? int(0.95 * $oldlim) : 1;
++      ($oldlim == RLIM_INFINITY) ? $oldlim : $oldlim ? int(0.95 * $oldlim) : 0;
+   
+   # print "newlim/1 = $newlim\n";
+ 
diff --git a/perl-BSD-Resource.spec b/perl-BSD-Resource.spec
index da4e616..7ab8a8d 100644
--- a/perl-BSD-Resource.spec
+++ b/perl-BSD-Resource.spec
@@ -1,15 +1,20 @@
 Name:           perl-BSD-Resource
 Version:        1.28
-Release: 	1.fc6.1
+Release:        2%{?dist}
 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
+Source0:        http://www.cpan.org/authors/id/J/JH/JHI/BSD-Resource-%{version}.tar.gz
+# Modified from http://rt.cpan.org/Public/Bug/Display.html?id=13131
+Patch0:         perl-BSD-Resource-1.28-fix-setrlimit-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -19,22 +24,22 @@ and priorities.
 
 %prep
 %setup -q -n BSD-Resource-%{version} 
+%patch -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+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 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/*
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+%{_fixperms} $RPM_BUILD_ROOT/*
 
-%check || :
-# fails test due to missing BuildReq? #153178
-#make test
+%check
+make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,7 +53,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
+* Sat Jun 30 2007 Steven Pritchard <steve@kspei.com> 1.28-2
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- Remove check macro cruft.
+- Remove redundant BR perl.
+- BR ExtUtils::MakeMaker, Test::More, Test::Pod, and Test::Pod::Coverage.
+- Patch t/setrlimit.t to fix bogus test failure.
+- Set OPTIMIZE when running Makefile.PL, not make.
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.28-1.fc6.1
 - rebuild
 
 * Mon Jun 05 2006 Jason Vas Dias <jvdias@redhat.com> - 1.28-1