[perl: 3/8] Merge branch 'master' of ssh://pkgs.fedoraproject.org/perl

[Jitka Plesnikova]

commit d956f613812fddb9707d45bf7538090b6c550d8e
Merge: 4537e79 df31eb4
Author: Jitka Plesnikova <jplesnik at redhat.com>
Date:   Fri Aug 1 13:57:08 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/perl
    
    Conflicts:
    	perl.spec

 perl.spec |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)
---
diff --cc perl.spec
index b134eb6,ba0fee3..06c71a0
--- a/perl.spec
+++ b/perl.spec
@@@ -30,7 -30,7 +30,7 @@@
  Name:           perl
  Version:        %{perl_version}
  # release number must be even higher, because dual-lived modules will be broken otherwise
--Release:        302%{?dist}
++Release:        303%{?dist}
  Epoch:          %{perl_epoch}
  Summary:        Practical Extraction and Report Language
  Group:          Development/Languages
@@@ -1462,8 -1637,42 +1462,25 @@@ Sys::Syslog is an interface to the UNI
  a string priority and a list of printf() arguments just like at syslog(3).
  %endif
  
+ %if %{dual_life} || %{rebuild_from_scratch}
+ %package Term-ANSIColor
+ Summary:        Color screen output using ANSI escape sequences
+ Group:          Development/Libraries
+ License:        GPL+ or Artistic
+ Epoch:          0
+ Version:        4.02
+ Requires:       %perl_compat
+ BuildArch:      noarch
+ Conflicts:      perl < 4:5.18.2-302
+ 
+ %description Term-ANSIColor
+ This module has two interfaces, one through color() and colored() and the
+ other through constants. It also offers the utility functions uncolor(),
+ colorstrip(), colorvalid(), and coloralias(), which have to be explicitly
+ imported to be used.
+ %endif
  
  %if %{dual_life} || %{rebuild_from_scratch}
 -%package Term-UI
 -Summary:        Term::ReadLine UI made easy
 -Group:          Development/Libraries
 -License:        GPL+ or Artistic
 -Epoch:          0
 -Version:        0.34
 -Requires:       %perl_compat
 -Requires:       perl(Log::Message::Simple)
 -BuildArch:      noarch
 -
 -%description Term-UI
 -Term::UI is a transparent way of eliminating the overhead of having to format
 -a question and then validate the reply, informing the user if the answer was not
 -proper and re-issuing the question.
 -%endif
 -
 -%if %{dual_life} || %{rebuild_from_scratch}
  %package Test-Harness
  Summary:        Run Perl standard test scripts with statistics
  Group:          Development/Languages
@@@ -1714,8 -1946,9 +1731,8 @@@ Requires:       perl-Pod-Checker, perl-
  Requires:       perl-Pod-Parser, perl-Pod-Perldoc, perl-Pod-Usage
  Requires:       perl-podlators, perl-Pod-Simple, perl-Scalar-List-Utils
  Requires:       perl-Socket, perl-Storable, perl-Sys-Syslog,
- Requires:       perl-Test-Harness, perl-Test-Simple
 -Requires:       perl-Term-ANSIColor, perl-Term-UI, perl-Test-Harness,
 -Requires:       perl-Test-Simple
 -Requires:       perl-Text-ParseWords, perl-Text-Soundex, perl-Thread-Queue
++Requires:       perl-Term-ANSIColor, perl-Test-Harness, perl-Test-Simple
 +Requires:       perl-Text-ParseWords, perl-Thread-Queue
  Requires:       perl-Time-HiRes
  Requires:       perl-Time-Local, perl-Time-Piece
  Requires:       perl-version, perl-threads, perl-threads-shared, perl-parent
@@@ -2533,7 -2825,15 +2550,10 @@@ sed 
  %exclude %{archlib}/auto/Sys/Syslog/
  %exclude %{_mandir}/man3/Sys::Syslog.*
  
+ # Term-ANSIColor
+ %exclude %{privlib}/Term/ANSIColor.pm
+ %exclude %{_mandir}/man3/Term::ANSIColor*
  
 -# Term-UI
 -%exclude %{privlib}/Term/UI.pm
 -%exclude %{privlib}/Term/UI/
 -%exclude %{_mandir}/man3/Term::UI*
 -
  # Test-Harness
  %exclude %{_bindir}/prove
  %exclude %{privlib}/App/Prove*
@@@ -3264,8 -3626,20 +3284,13 @@@
  %{_mandir}/man3/Storable.*
  %endif
  
+ %if %{dual_life} || %{rebuild_from_scratch}
+ %files Term-ANSIColor
+ %{privlib}/Term/ANSIColor.pm
+ %{_mandir}/man3/Term::ANSIColor*
+ %endif
  
  %if %{dual_life} || %{rebuild_from_scratch}
 -%files Term-UI
 -%{privlib}/Term/UI/
 -%{privlib}/Term/UI.pm
 -%{_mandir}/man3/Term::UI*
 -%endif
 -
 -%if %{dual_life} || %{rebuild_from_scratch}
  %files Test-Harness
  %{_bindir}/prove
  %{privlib}/App/Prove*
@@@ -3352,13 -3732,9 +3377,16 @@@
  
  # Old changelog entries are preserved in CVS.
  %changelog
- * Tue Jul 22 2014 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.20.0-302
++* Fri Aug  1 2014 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.20.0-303
 +- Update to Perl 5.20.0
 +- Clean patches, not needed with new version
 +- Update patches to work with new version
 +- Update version of sub-packages, remove the deleted sub-packages
 +- Sub-package perl-IO-Socket-IP, perl-experimental
 +
+ * Tue Jul 29 2014 Jitka Plesnikova <jplesnik at redhat.com> - 4:5.18.2-302
+ - Sub-package perl-Term-ANSIColor and remove it (bug #1121924)
+ 
  * Fri Jun 27 2014 Petr Pisar <ppisar at redhat.com> - 4:5.18.2-301
  - Remove bundled perl-App-a2p, perl-App-find2perl, perl-App-s2p, and
    perl-Package-Constants