diff --git a/.gitignore b/.gitignore
index 618e82b..d9df7b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-Version-Requirements-0.101020.tar.gz
-/Version-Requirements-0.101021.tar.gz
-/Version-Requirements-0.101022.tar.gz
+/Version-Requirements-[0-9.]*.tar.gz
diff --git a/perl-Version-Requirements.spec b/perl-Version-Requirements.spec
index 274e04f..96e8fad 100644
--- a/perl-Version-Requirements.spec
+++ b/perl-Version-Requirements.spec
@@ -1,26 +1,30 @@
 Name:           perl-Version-Requirements
-Version:        0.101022
-Release:        249%{?dist}
+Version:        0.101023
+Release:        1%{?dist}
 Summary:        Set of version requirements for a CPAN dist (DEPRECATED)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Version-Requirements/
 Source0:        http://www.cpan.org/authors/id/R/RJ/RJBS/Version-Requirements-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.30
-# Run-time:
+# Module Build
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# Module Runtime
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Scalar::Util)
-# tests
-BuildRequires:  perl(Test::More) >= 0.88
-%if !%{defined perl_bootstrap}
-BuildRequires:  perl(Test::Pod) >= 1.41
-%endif
+BuildRequires:  perl(strict)
 BuildRequires:  perl(version) >= 0.77
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
+BuildRequires:  perl(warnings)
+# Test Suite
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(Test::More) >= 0.88
+# Optional Tests
+BuildRequires:  perl(CPAN::Meta) >= 2.120900
+BuildRequires:  perl(CPAN::Meta::Prereqs)
+# Runtime
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Version::Requirements is now DEPRECATED.
@@ -36,32 +40,47 @@ them to the simplest representation.
 %setup -q -n Version-Requirements-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make pure_install DESTDIR=$RPM_BUILD_ROOT
-
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
-RELEASE_TESTING=1 make test
+make test
+
+# Run the test suite again with PERL_CORE set to get rid of the deprecation warnings
+make test PERL_CORE=1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%doc Changes LICENSE README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Changes README
+%{perl_vendorlib}/Version/
+%{_mandir}/man3/Version::Requirements.3*
 
 %changelog
+* Thu Mar 26 2015 Paul Howarth <paul@city-fan.org> - 0.101023-1
+- Update to 0.101023
+  - Document in the metadata that this module is deprecated
+- Classify buildreqs by usage
+- Run the test suite again with PERL_CORE set to get rid of the deprecation
+  warnings
+- Drop %%defattr, redundant since rpm 4.4
+- Drop redundant %%{?perl_default_filter}
+- Don't use macros for commands
+- Don't need to remove empty directories from the buildroot
+- Use %%license where possible
+
 * Sun Sep 07 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.101022-249
 - Perl 5.20 re-rebuild of bootstrapped packages
 
diff --git a/sources b/sources
index f0ddcb3..386f094 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74e8a660969e30ffbb64999806c0769c  Version-Requirements-0.101022.tar.gz
+0ceebafa26543bbe8cc9a035d0612cac  Version-Requirements-0.101023.tar.gz