[perl-JSON-XS/epel7] Tidy up and get rid of tests subpackage

[Paul Howarth]

commit ac20c0bba4cf630d88239d851b93bc54062273c6
Author: Paul Howarth <paul(a)city-fan.org&gt;
Date:   Sun Feb 16 17:19:53 2014 +0000

    Tidy up and get rid of tests subpackage
    
    - Get rid of tests subpackage
    - Specify all dependencies
    - Don't need to remove empty directories from the buildroot
    - Make %files list more explicit

 perl-JSON-XS.spec |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)
---
diff --git a/perl-JSON-XS.spec b/perl-JSON-XS.spec
index a063245..265e05a 100644
--- a/perl-JSON-XS.spec
+++ b/perl-JSON-XS.spec
@@ -1,28 +1,31 @@
 Name:           perl-JSON-XS
-Summary:        JSON serializing/deserializing, done correctly and fast
+Summary:        JSON serializing/de-serializing, done correctly and fast
 Epoch:          1
 Version:        3.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/JSON-XS/
 Source0:        http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{version}.tar.gz
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
-
 BuildRequires:  perl(common::sense)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Encode)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(Storable)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(Test)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Tie::Array)
+BuildRequires:  perl(Tie::Hash)
 BuildRequires:  perl(Types::Serialiser)
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(warnings)
 BuildRequires:  perl(XSLoader)
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo
$version))
+Obsoletes:      perl-JSON-XS-tests < %{epoch}:%{version}-%{release}
 
+# Avoid unwanted provides and dependencies
 %{?perl_default_filter}
-%{?perl_default_subpackage_tests}
 
 %description
 This module converts Perl data structures to JSON and vice versa. Its
@@ -32,34 +35,41 @@ reach the latter goal it was written in C.
 %prep
 %setup -q -n JSON-XS-%{version}
 
-sed -i 's/\r//' t/*
-perl -pi -e 's|^#!/opt/bin/perl|#!%{__perl}|' eg/*
+# Fix shellbangs
+perl -pi -e 's|^#!/opt/bin/perl|#!/usr/bin/perl|' eg/*
+
+# Avoid doc-file dependencies
 chmod -c -x eg/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 %install
 make pure_install DESTDIR=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} +
-find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} %{buildroot}/*
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} ';'
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
 %files
 %doc Changes COPYING README eg/
-%{perl_vendorarch}/*
-%exclude %dir %{perl_vendorarch}/auto
-%{_bindir}/*
-%{_mandir}/man[13]/*
+%{_bindir}/json_xs
+%{perl_vendorarch}/auto/JSON/
+%{perl_vendorarch}/JSON/
+%{_mandir}/man1/json_xs.1*
+%{_mandir}/man3/JSON::XS.3pm*
+%{_mandir}/man3/JSON::XS::Boolean.3pm*
 
 %changelog
+* Sun Feb 16 2014 Paul Howarth <paul(a)city-fan.org&gt; - - 1:3.01-2
+- Get rid of tests subpackage
+- Specify all dependencies
+- Don't need to remove empty directories from the buildroot
+- Make %%files list more explicit
+
 * Sun Nov 03 2013 Emmanuel Seyman <emmanuel(a)seyman.fr&gt; - 1:3.01-1
 - Update to 3.01