From 669c037484e18ca664f2cb5600a92f644c0d6734 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Mar 19 2015 17:20:42 +0000
Subject: 0.16 bump


- Remove bundled libs, drop the patch
- Modernize spec file and fix the dep list

---

diff --git a/.gitignore b/.gitignore
index cf3bc51..4dc6526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Data-Structure-Util-0.15.tar.gz
+/Data-Structure-Util-0.16.tar.gz
diff --git a/Data-Structure-Util-0.15-Remove-failed-test-cases.patch b/Data-Structure-Util-0.15-Remove-failed-test-cases.patch
deleted file mode 100644
index fe39d25..0000000
--- a/Data-Structure-Util-0.15-Remove-failed-test-cases.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rup Data-Structure-Util-0.15-crimpK-orig/t/06signature.t Data-Structure-Util-0.15-crimpK/t/06signature.t
---- Data-Structure-Util-0.15-crimpK-orig/t/06signature.t	2008-03-09 03:48:59.000000000 -0700
-+++ Data-Structure-Util-0.15-crimpK/t/06signature.t	2013-09-01 17:11:26.000000000 -0700
-@@ -21,7 +21,7 @@ BEGIN {
-     }
- }
- 
--use Test::More tests => 16;
-+use Test::More tests => 14;
- 
- ok( 1, "we loaded fine..." );
- 
-@@ -62,8 +62,6 @@ isnt( signature( $obj4 ), $sig4, "Signat
- 
- ok( signature(), "none" );
- is( signature(), signature(), "empty list" );
--ok( my $sigundef = signature( undef ), "none" );
--isnt( $sigundef, signature( undef ), "none" );
- 
- # BELOW THIS LINE REQUIRES PERL 5.8.0 OR GREATER
- SKIP: {
diff --git a/perl-Data-Structure-Util.spec b/perl-Data-Structure-Util.spec
index a0bf853..9767d60 100644
--- a/perl-Data-Structure-Util.spec
+++ b/perl-Data-Structure-Util.spec
@@ -1,31 +1,38 @@
 Name:           perl-Data-Structure-Util
-Version:        0.15
-Release:        19%{?dist}
+Version:        0.16
+Release:        1%{?dist}
 Summary:        Change nature of data within a structure
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Data-Structure-Util/
 Source0:        http://www.cpan.org/authors/id/A/AN/ANDYA/Data-Structure-Util-%{version}.tar.gz
-# Fix for RT#88257
-Patch0:         Data-Structure-Util-0.15-Remove-failed-test-cases.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-
+# Build
+BuildRequires:  perl
+BuildRequires:  perl(Devel::CheckLib)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(lib)
+BuildRequires:  perl(strict)
+# Runtime
 BuildRequires:  perl(AutoLoader)
-BuildRequires:  perl(CPAN::Meta)
-BuildRequires:  perl(Data::Dumper)
-BuildRequires:	perl(Devel::CheckLib)
 BuildRequires:	perl(Digest::MD5)
 BuildRequires:  perl(DynaLoader)
-BuildRequires:  perl(Encode)
 BuildRequires:  perl(Exporter)
-BuildRequires:  perl(File::Find::Rule)
-BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Storable)
+BuildRequires:  perl(vars)
+BuildRequires:  perl(warnings::register)
+# Tests only
+BuildRequires:  perl(blib)
+BuildRequires:  perl(bytes)
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(utf8)
+BuildRequires:  perl(warnings)
+# Optional tests only
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(File::Find::Rule)
+BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(XML::Simple)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Unused if Encode is available BuildRequires:  perl(XML::Simple)
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %description
 Data::Structure::Util is a toolbox to manipulate the data inside a data
@@ -34,42 +41,35 @@ requested on each appropriate element.
 
 %prep
 %setup -q -n Data-Structure-Util-%{version}
-%patch0 -p1
-
-chmod 644 CHANGES README bin/packages.pl
+chmod 644 -c CHANGES README bin/packages.pl
+rm -r inc && sed -e '/^inc.*$/d' -i MANIFEST
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-rm -f $RPM_BUILD_ROOT%{_bindir}/packages.pl \
-    $RPM_BUILD_ROOT%{_mandir}/man1/packages.pl*
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_bindir}/packages.pl \
+      %{buildroot}%{_mandir}/man1/packages.pl*
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} +
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGES README bin/packages.pl
 %{perl_vendorarch}/auto/*
-%{perl_vendorarch}/Data*
+%{perl_vendorarch}/*
 %{_mandir}/man3/*
 
 %changelog
+* Thu Mar 19 2015 Petr Šabata <contyk@redhat.com> - 0.16-1
+- 0.16 bump
+- Remove bundled libs, drop the patch
+- Modernize spec file and fix the dep list
+
 * Fri Aug 29 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.15-19
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index c4d083b..93f34b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e12ba777c0abfbd79a131de28d542359  Data-Structure-Util-0.15.tar.gz
+ada3241ff14e895e26e9a112bd5c3431  Data-Structure-Util-0.16.tar.gz