corsepiu pushed to perl-CHI (f21). "Merge remote-tracking branch 'origin/f22' into f21"

[notifications at fedoraproject.org]

From 0427cc27e236eecceca21617514c290afd7c6bc1 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik at redhat.com>
Date: Sun, 7 Jun 2015 00:48:01 +0200
Subject: Perl 5.22 rebuild


diff --git a/perl-CHI.spec b/perl-CHI.spec
index 3efccd2..c25fffe 100644
--- a/perl-CHI.spec
+++ b/perl-CHI.spec
@@ -1,6 +1,6 @@
 Name:           perl-CHI
 Version:        0.59
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unified cache handling interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -128,6 +128,9 @@ make test %{?with_author_tests:AUTHOR_TESTING=1} %{?with_smoke_tests:AUTOMATED_T
 %{perl_vendorlib}/CHI/Test*
 
 %changelog
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.59-2
+- Perl 5.22 rebuild
+
 * Thu Jan 08 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.59-1
 - Upstream update.
 - Reflect upstream URL having changed.
-- 
cgit v0.10.2


From fe32279c4396d23e3aeb1eabcce5862fd61081e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 10 Jun 2015 10:54:21 +0200
Subject: Upstream update.

- Reflect upstream having switched from JSON to JSON::MaybeXS.
- Introduce %license.

diff --git a/.gitignore b/.gitignore
index 9161942..aa92ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/CHI-0.59.tar.gz
+/CHI-0.60.tar.gz
diff --git a/perl-CHI.spec b/perl-CHI.spec
index c25fffe..ef8c5c2 100644
--- a/perl-CHI.spec
+++ b/perl-CHI.spec
@@ -1,6 +1,6 @@
 Name:           perl-CHI
-Version:        0.59
-Release:        2%{?dist}
+Version:        0.60
+Release:        1%{?dist}
 Summary:        Unified cache handling interface
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -21,7 +21,7 @@ BuildRequires:  perl(Digest::MD5)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(File::Spec) >= 0.80
 BuildRequires:  perl(Hash::MoreUtils)
-BuildRequires:  perl(JSON)
+BuildRequires:  perl(JSON::MaybeXS) >= 1.003003
 BuildRequires:  perl(List::MoreUtils) >= 0.13
 BuildRequires:  perl(Log::Any) >= 0.08
 BuildRequires:  perl(Log::Any::Adapter::Dispatch) >= 0.05
@@ -109,7 +109,8 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test %{?with_author_tests:AUTHOR_TESTING=1} %{?with_smoke_tests:AUTOMATED_TESTING=1}
 
 %files
-%doc Changes LICENSE
+%doc Changes
+%license LICENSE
 %dir %{perl_vendorlib}/CHI
 %{perl_vendorlib}/CHI.pm
 %{perl_vendorlib}/CHI/Benchmarks.pod
@@ -128,6 +129,11 @@ make test %{?with_author_tests:AUTHOR_TESTING=1} %{?with_smoke_tests:AUTOMATED_T
 %{perl_vendorlib}/CHI/Test*
 
 %changelog
+* Wed Jun 10 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.60-1
+- Upstream update.
+- Reflect upstream having switched from JSON to JSON::MaybeXS.
+- Introduce %%license.
+
 * Sat Jun 06 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.59-2
 - Perl 5.22 rebuild
 
diff --git a/sources b/sources
index d42b4db..5330906 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc0d4210ed8d132e7bc0bd0c2bd0b62f  CHI-0.59.tar.gz
+e559c52c12de4a27b0210caa1c790e65  CHI-0.60.tar.gz
-- 
cgit v0.10.2


From f7eaab57af9721cd43330c52c3c0588acb971acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu at fedoraproject.org>
Date: Wed, 10 Jun 2015 11:02:26 +0200
Subject: Cleanup merger.


diff --git a/perl-CHI.spec b/perl-CHI.spec
index ef8c5c2..e098645 100644
--- a/perl-CHI.spec
+++ b/perl-CHI.spec
@@ -134,9 +134,6 @@ make test %{?with_author_tests:AUTHOR_TESTING=1} %{?with_smoke_tests:AUTOMATED_T
 - Reflect upstream having switched from JSON to JSON::MaybeXS.
 - Introduce %%license.
 
-* Sat Jun 06 2015 Jitka Plesnikova <jplesnik at redhat.com> - 0.59-2
-- Perl 5.22 rebuild
-
 * Thu Jan 08 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.59-1
 - Upstream update.
 - Reflect upstream URL having changed.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/perl-CHI.git/commit/?h=f21&id=ff9a205faee43262e5270d21be669621fe9ce006