diff --git a/perl-Declare-Constraints-Simple.spec b/perl-Declare-Constraints-Simple.spec
index 99cb329..16a70bc 100644
--- a/perl-Declare-Constraints-Simple.spec
+++ b/perl-Declare-Constraints-Simple.spec
@@ -1,6 +1,9 @@
+# Provides/Requires filtering is different from rpm 4.9 onwards
+%global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e')
+
 Name:		perl-Declare-Constraints-Simple
 Version:	0.03
-Release:	24%{?dist}
+Release:	25%{?dist}
 Summary:	Declarative Validation of Data Structures
 License:	GPL+ or Artistic
 Group:		Development/Libraries
@@ -8,21 +11,42 @@ URL:		http://search.cpan.org/dist/Declare-Constraints-Simple/
 Source0:	http://search.cpan.org/CPAN/authors/id/P/PH/PHAYLON/Declare-Constraints-Simple-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
-# Build
-BuildRequires:	perl(ExtUtils::MakeMaker) 
-# Module
+# Module Build
+BuildRequires:	coreutils
+BuildRequires:	findutils
+BuildRequires:	make
+BuildRequires:	perl
+# Dependencies of bundled Module::Install
+BuildRequires:	perl(Config)
+BuildRequires:	perl(Cwd)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(ExtUtils::Manifest)
+BuildRequires:	perl(ExtUtils::MM_Unix)
+BuildRequires:	perl(File::Find)
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Spec)
+BuildRequires:	perl(FileHandle)
+BuildRequires:	perl(FindBin)
+BuildRequires:	perl(vars)
+BuildRequires:	perl(warnings)
+BuildRequires:	perl(YAML)
+# Module Runtime
 BuildRequires:	perl(aliased)
+BuildRequires:	perl(base)
 BuildRequires:	perl(Carp::Clan)
 BuildRequires:	perl(Class::Inspector)
-BuildRequires:	perl(Scalar::Util)
-# Test suite
-BuildRequires:	perl(Test::More) 
-BuildRequires:	perl(Test::Pod)
-BuildRequires:	perl(Test::Pod::Coverage)
-# Runtime
+BuildRequires:	perl(overload)
+BuildRequires:	perl(Scalar::Util) >= 1.14
+BuildRequires:	perl(strict)
+# Test Suite
+BuildRequires:	perl(Test::More)
+# Optional Tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+BuildRequires:	perl(Test::Pod::Coverage) >= 1.00
+# Dependencies
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
-# Filter unwanted Requires: (rpm 4.9 onwards)
+# Filter unwanted Requires (rpm 4.9 onwards)
 %global __requires_exclude ^perl\\(Declare::Constraints::Simple-Library\\)
 
 %description
@@ -34,18 +58,19 @@ declarative keywords in the importing namespace.
 %setup -q -n Declare-Constraints-Simple-%{version}
 
 # Filter unwanted Requires (prior to rpm 4.9)
+%if ! %{rpm49}
 %global reqfilt /bin/sh -c "%{__perl_requires} | grep -Fvx 'perl(Declare::Constraints::Simple-Library)'"
-%define __perl_requires %{reqfilt}
+%global __perl_requires %{reqfilt}
+%endif
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
 %{_fixperms} %{buildroot}
 
 %check
@@ -55,24 +80,29 @@ make test
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README t/
 %{perl_vendorlib}/Declare/
-%{_mandir}/man3/Declare::Constraints::Simple.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Array.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Base.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Exportable.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::General.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Hash.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Numerical.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::OO.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Operators.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Referencial.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Library::Scalar.3pm*
-%{_mandir}/man3/Declare::Constraints::Simple::Result.3pm*
+%{_mandir}/man3/Declare::Constraints::Simple.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Array.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Base.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Exportable.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::General.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Hash.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Numerical.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::OO.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Operators.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Referencial.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Library::Scalar.3*
+%{_mandir}/man3/Declare::Constraints::Simple::Result.3*
 
 %changelog
+* Wed Jan 27 2016 Paul Howarth <paul@city-fan.org> - 0.03-25
+- Spec clean-up
+  - Prefer %%global over %%define
+  - Drop %%defattr, redundant since rpm 4.4
+  - Don't need to remove empty directories from the buildroot
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.03-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild