From 7be9c1b764ddb289b57f89c27e69d47b7204c08e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Mon, 16 Jan 2017 10:28:18 +0100
Subject: 0.9162 bump

---
 .gitignore                                         |  1 +
 ...ix-RT-116479-test-failure-with-v5.24.1-RC.patch | 93 ----------------------
 CPANPLUS-0.9160-Spelling-fix.patch                 | 30 -------
 perl-CPANPLUS.spec                                 | 24 ++----
 sources                                            |  2 +-
 5 files changed, 8 insertions(+), 142 deletions(-)
 delete mode 100644 
CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch
 delete mode 100644 CPANPLUS-0.9160-Spelling-fix.patch

diff --git a/.gitignore b/.gitignore
index af4368c..bae3afb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ CPANPLUS-0.84.tar.gz
 /CPANPLUS-0.9154.tar.gz
 /CPANPLUS-0.9156.tar.gz
 /CPANPLUS-0.9160.tar.gz
+/CPANPLUS-0.9162.tar.gz
diff --git a/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch 
b/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch
deleted file mode 100644
index d5dcfa4..0000000
--- a/CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fe39e473a39e00b0bc9448f0c77333bd7fa1a7c0 Mon Sep 17 00:00:00 2001
-From: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
-Date: Wed, 27 Jul 2016 20:10:44 +0100
-Subject: [PATCH] Fix RT#116479 test failure with v5.24.1-RC*
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Cwd in recently released perls is using tr/_// on $VERSION
-which causes our test to fail.
-
-Fix: don't rely on things outside our control in the test
-
-Blame rjbs ultimately.
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- MANIFEST                                            |   1 +
- t/40_CPANPLUS-Internals-Report.t                    |   6 +++---
- t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz | Bin 0 -> 119 bytes
- t/dummy-CPAN/modules/02packages.details.txt.gz      | Bin 437 -> 451 bytes
- 4 files changed, 4 insertions(+), 3 deletions(-)
- create mode 100644 t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz
-
-diff --git a/MANIFEST b/MANIFEST
-index a83b96a..cba6eaa 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -134,6 +134,7 @@ t/40_CPANPLUS-Internals-Report.t
- t/dummy-CPAN/authors/01mailrc.txt.gz
- t/dummy-CPAN/authors/id/EUNOXS/Bundle-Foo-Bar-0.01.tar.gz
- t/dummy-CPAN/authors/id/EUNOXS/CHECKSUMS
-+t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz
- t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.meta
- t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.readme
- t/dummy-CPAN/authors/id/EUNOXS/Foo-Bar-0.01.tar.gz
-diff --git a/t/40_CPANPLUS-Internals-Report.t 
b/t/40_CPANPLUS-Internals-Report.t
-index a882335..6a5fc8d 100644
---- a/t/40_CPANPLUS-Internals-Report.t
-+++ b/t/40_CPANPLUS-Internals-Report.t
-@@ -310,9 +310,9 @@ my $map = {
-         my $str = REPORT_TOOLCHAIN_VERSIONS->( $clone );
- 
-         like($str, qr/toolchain/,  "Correct message in report" );
--        use Cwd;
--        like($str, qr/Cwd\s+\Q$Cwd::VERSION\E/,
--                                        "Cwd has correct version in report" );
-+        use CPANPLUS;
-+        like($str, qr/CPANPLUS\s+\Q$CPANPLUS::VERSION\E/,
-+                                        "CPANPLUS has correct version in 
report" );
-     }
- }
- 
-diff --git a/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz 
b/t/dummy-CPAN/authors/id/EUNOXS/CPANPLUS-0.01.tar.gz
-new file mode 100644
-index 
0000000000000000000000000000000000000000..1d1e081ad650eb8481265ce4233f0c9d3c7a8930
-GIT binary patch
-literal 119
-zcmb2|=3pp!ve%V?`R#c_t_A}hhl?^x)hBE*`)cv%!IF-Uz5A88cD=arcK=iUlM~L=
-z%B>CB8kVi;!moL3v+t&G{YO{VtPK8O*zqgD@o47C=6Tyv-)<^4Dhd9-^}G3g`JLPh
-R$iTtT+H``gGlK>L0|4xAF{uCm
-
-literal 0
-HcmV?d00001
-
-diff --git a/t/dummy-CPAN/modules/02packages.details.txt.gz 
b/t/dummy-CPAN/modules/02packages.details.txt.gz
-index 
ec0f69d8cb3e181a031704287fc48f73a27bceee..f52ed6b413e97690df76d2f764472523043309df
 100644
-GIT binary patch
-literal 451
-zcmV;!0X+U6iwFoe1({a>128ghVPk7yXJvCPWMy<=X>4;Yba-?Cozq`$(=ZSK@b`R*
-zd*A`2#_>{B2tU!376I+3DAD$Yy!h5yBz9z97P?Q5z3y)zz&J&U<eY!LOL7Zcqky~M
-zc`K{$a*LiRB&lo9=m#a`m*qna?1);CWqseX7G2FM+hnu#^fYU%>T2}afbtG~<#bEh
-znxL%@DPUxS9xiQX6leoVJFLjMJ-oOvWk);fe5O^F%xv8?#^09GJ_1H?h0X_f6qae1
-zd@zJYp-LCl37B?d8%e0(5~<pOvmI%JesnlIKnTiKU4w>XERQ8;PE#P#VjoXyYNb8(
-zGH!l(1vwk@{1sg6VQQ2^>DecXMsMFrqZ=7|PL_dBXQ3yG+fUvkOX(>sTNSGiaE59G
-zV-6psft>Rk_(bI4dJXSaUz22Etq_HDLd;7c&Npxrobi)*pO@#GEF`BPH;s#oq+{Fb
-zN5HE16R;}&2{`?HOgsSb*<Xm*#4s^0pFs$*=`Q|<IDP}qAd2v3h8Yn<)Ddw=Pk$%P
-tdNowXP2^9dI9wCP`Q#fP-xFab*30sjFFH`nUHX$UlAod*sN?hl008l+(0Kp=
-
-literal 437
-zcmV;m0ZRTKiwFoea572&128ghVPk7yXJvCPWMy<=X>4;Yba-?Cozqco(=ZSK;CKIu
-zd*A`2#_>{BOn#y%EdttYqD0%<<i)qvBC#X;vQU0K_R6$TQD8e+ie#TZ-&yg(G$`RA
-zMA51Go7!OD8cCTZaQaTH`m%h?fh|!d^L!Wv-l1=J?b>{HF+Iy$r~3v&enfeXq4uUD
-z<80I}_9<Xhivez3Z#5VT+IXzV`5nBvH&stt=R<CE&StLZTN{3r(mer2aECrbcoe5;
-z%RX8{t5IhQ=Os*ga;+lNaEnxL!MmP}#W30*9w7wn>b^xwDwW6Cr8g9btlXv3+D4l|
-zgG!rU-$B90qId&0JD6JSQ3d|lp*5R#%9>Wip4l?;*(~-%Y5U13TdF`=)#+4)giF*T
-z7z_BMEEGZ%ASSYi<1KtxePwLnoRp>VQqC(Wuhwu7f{T;%omW@uJSJx`H%pV8l;@it
-zPk>eVH(*u%7jSldNIU{*?H@#H;y5v{o<T^t?r&Z~9Nxe)h%)|}@r}r1)B&+i&;BIM
-f27RoK`zU^w(&L(NAtu*i{6Mguaee}9umb=9u36EE
-
--- 
-2.7.4
-
diff --git a/CPANPLUS-0.9160-Spelling-fix.patch 
b/CPANPLUS-0.9160-Spelling-fix.patch
deleted file mode 100644
index 825366f..0000000
--- a/CPANPLUS-0.9160-Spelling-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 89c4595a43fa7fa9c914c5b1765acc2104dca6d2 Mon Sep 17 00:00:00 2001
-From: Gregor Herrmann <gre...@debian.org>
-Date: Mon, 25 Jul 2016 11:31:39 +0100
-Subject: [PATCH] Spelling fix
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- bin/cpan2dist | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/cpan2dist b/bin/cpan2dist
-index 4853325..54552d8 100644
---- a/bin/cpan2dist
-+++ b/bin/cpan2dist
-@@ -496,7 +496,7 @@ Options:
-                   May be given multiple times.
-     --logfile     File to log all output to. By default, all output goes
-                   to the console.
--    --timeout     The allowed time for buliding a distribution before
-+    --timeout     The allowed time for building a distribution before
-                   aborting. This is useful to terminate any build that
-                   hang or happen to be interactive despite being told not
-                   to be. Defaults to 300 seconds. To turn off, you can
--- 
-2.7.4
-
diff --git a/perl-CPANPLUS.spec b/perl-CPANPLUS.spec
index 0f2b7bd..c43d1a8 100644
--- a/perl-CPANPLUS.spec
+++ b/perl-CPANPLUS.spec
@@ -1,20 +1,12 @@
-%global cpan_version 0.9160
+%global cpan_version 0.9162
 Name:           perl-CPANPLUS
-# Keep 2-digit major varion to compete with perl.spec for history
-Version:        %(echo '%{cpan_version}' | sed 's/\(\...\)/\1./')
-Release:        2%{?dist}
+Version:        0.916.200
+Release:        1%{?dist}
 Summary:        Ameliorated interface to the Comprehensive Perl Archive Network
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/CPANPLUS/
 Source0:        
http://www.cpan.org/authors/id/B/BI/BINGOS/CPANPLUS-%{cpan_version}.tar.gz
-# Correct a typo in cpan2dist manual, in upstream after 0.9160
-Patch0:         CPANPLUS-0.9160-Spelling-fix.patch
-# Fix a test failing with underscored Cwd version, CPAN RT#116479,
-# in upstream after 0.9160
-# XXX: This is a git binary diff, use git for applying it
-BuildRequires:  git-core
-Patch1:         
CPANPLUS-0.9160-Fix-RT-116479-test-failure-with-v5.24.1-RC.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -101,13 +93,6 @@ interactive shells, command line programs, etc., that use 
this API.
 
 %prep
 %setup -q -n CPANPLUS-%{cpan_version}
-%patch0 -p1
-git init-db
-git add .
-git config user.email "y...@example.com"
-git config user.name "Your Name"
-git commit -a -m 'import'
-git am <%{PATCH1}
 # Remove bundled modules
 %if !%{defined perl_bootstrap}
 rm -rf inc
@@ -139,6 +124,9 @@ make test %{?_smp_mflags}
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jan 16 2017 Petr Pisar <ppi...@redhat.com> - 0.916.200-1
+- 0.9162 bump
+
 * Tue Oct 04 2016 Petr Pisar <ppi...@redhat.com> - 0.91.60-2
 - Correct a typo in cpan2dist manual
 - Fix a test failing with underscored Cwd version (CPAN RT#116479)
diff --git a/sources b/sources
index 54f44b8..33cfe9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3553c520142dbf677432168416edeafe  CPANPLUS-0.9160.tar.gz
+SHA512 (CPANPLUS-0.9162.tar.gz) = 
c82bf214171dee44de776207449adbfb0e2a58ab66424f462ecffb661e9ee4fdd6c568c4ea0fddc1ea5ba6b189ec4066f0dcdc596fa2692e287b2591e618124b
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-CPANPLUS.git/commit/?h=master&id=7be9c1b764ddb289b57f89c27e69d47b7204c08e
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to