commit ae8f15572c29f03bed4f9ca3a51d4970df3b4070 Author: Petr Šabata <contyk@xxxxxxxxxx> Date: Fri Nov 21 14:55:48 2014 +0100 0.051 bump .gitignore | 1 + perl-Hash-Merge-Simple.spec | 63 ++++++++++++++++++++++--------------------- sources | 2 +- 3 files changed, 34 insertions(+), 32 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6f5322d..c149b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ Hash-Merge-Simple-0.04.tar.gz +/Hash-Merge-Simple-0.051.tar.gz diff --git a/perl-Hash-Merge-Simple.spec b/perl-Hash-Merge-Simple.spec index cf35375..c5ad498 100644 --- a/perl-Hash-Merge-Simple.spec +++ b/perl-Hash-Merge-Simple.spec @@ -1,19 +1,28 @@ -Name: perl-Hash-Merge-Simple -Version: 0.04 -Release: 15%{?dist} -# lib/Hash/Merge/Simple.pm -> GPL+ or Artistic -License: GPL+ or Artistic -Group: Development/Libraries -Summary: Recursively merge two or more hashes, simply -Source: http://search.cpan.org/CPAN/authors/id/R/RK/RKRIMEN/Hash-Merge-Simple-%{version}.tar.gz -Url: http://search.cpan.org/dist/Hash-Merge-Simple -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -BuildArch: noarch - -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(Test::Deep) -BuildRequires: perl(Test::More) +Name: perl-Hash-Merge-Simple +Version: 0.051 +Release: 1%{?dist} +License: GPL+ or Artistic +Summary: Recursively merge two or more hashes, simply +Source: http://search.cpan.org/CPAN/authors/id/R/RO/ROKR/Hash-Merge-Simple-%{version}.tar.gz +Url: http://search.cpan.org/dist/Hash-Merge-Simple +BuildArch: noarch +# Build +BuildRequires: perl +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +# Runtime +BuildRequires: perl(Clone) +BuildRequires: perl(Exporter) +BuildRequires: perl(Storable) +BuildRequires: perl(vars) +# Tests only +BuildRequires: perl(Test::Deep) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Most) +Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) +Requires: perl(Clone) +Requires: perl(Exporter) %description Hash::Merge::Simple will recursively merge two or more hashes and return @@ -22,40 +31,32 @@ merge hashes that exist under the same node in both the left and right hash, but doesn't attempt to combine arrays, objects, scalars, or anything else. The rightmost hash also takes precedence, replacing whatever was in the left hash if a conflict occurs. This code was pretty -much taken straight from Catalyst::Utils, and modified to handle more +much taken straight from Catalyst::Utils, and modified to handle more than 2 hashes at the same time. %prep %setup -q -n Hash-Merge-Simple-%{version} -perl -pi -e 's/Test::Most/Test::More/g' `find . -type f` - %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 make %{?_smp_mflags} %install -rm -rf %{buildroot} - -make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' - +make pure_install DESTDIR=%{buildroot} %{_fixperms} %{buildroot}/* %check make test -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) -%doc Changes README +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/*.3* %changelog +* Fri Nov 21 2014 Petr Šabata <contyk@xxxxxxxxxx> - 0.051-1 +- 0.051 bump + * Wed Aug 27 2014 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 0.04-15 - Perl 5.20 rebuild diff --git a/sources b/sources index e3d65ed..4f43b1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -977b6f679977e720ea70cef6acd00b47 Hash-Merge-Simple-0.04.tar.gz +f47b9b99794b1f958bcfa3e816ff4660 Hash-Merge-Simple-0.051.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel