From 6060759e6eb31bd341aaa456b0a28f29ce72756818bcccf3788de705b3583894 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 17 Jun 2013 08:57:49 +0000
Subject: [PATCH] cherry-pick

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl?expand=0&rev=80
---
 macros.perl  |  5 +++++
 perl.changes | 11 +++++++++++
 perl.spec    | 17 ++++++++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/macros.perl b/macros.perl
index 4ec7a2c..e6b1c00 100644
--- a/macros.perl
+++ b/macros.perl
@@ -108,6 +108,11 @@ done\
 # add man pages\
 # if exist :)\
 if [ -d "${RPM_BUILD_ROOT}%{_mandir}" ]; then\
+for file in `cd "${RPM_BUILD_ROOT}%{_mandir}" && find . -type f`; do \
+   if test -e "%{_mandir}/$file" -o -e "%{_mandir}/$file.gz"; then \
+     mv ${RPM_BUILD_ROOT}%{_mandir}/$file ${RPM_BUILD_ROOT}%{_mandir}/${file/3pm/3pmc} \
+   fi \
+done \
 fgen_file "%{_mandir}/man?/*"\
 fi\
 \
diff --git a/perl.changes b/perl.changes
index ac10bcf..ecdade3 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jun 11 11:49:17 UTC 2013 - coolo@suse.com
+
+- moving the provides of perl-macros to perl-doc so we can check
+  for duplicated man pages in the gen_filelist macro
+
+-------------------------------------------------------------------
+Tue Jun 11 04:31:59 UTC 2013 - coolo@suse.com
+
+- obsolete perl-PathTools and other modules in core
+
 -------------------------------------------------------------------
 Fri Nov 16 08:41:10 UTC 2012 - coolo@suse.com
 
diff --git a/perl.spec b/perl.spec
index 3897cc8..6bba0fc 100644
--- a/perl.spec
+++ b/perl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package perl
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -53,10 +53,8 @@ Suggests:       perl-doc = %version
 Provides:       perl = %pversion-%release
 %endif
 Provides:       perl-500
-Provides:       perl-macros
-Provides:       perl(:MODULE_COMPAT_%pversion)
-Obsoletes:      perl-macros
 Provides:       perl-Filter-Simple
+Provides:       perl(:MODULE_COMPAT_%pversion)
 Obsoletes:      perl-Filter-Simple
 Provides:       perl-I18N-LangTags
 Obsoletes:      perl-I18N-LangTags
@@ -84,9 +82,7 @@ Provides:       perl-IO-Zlib
 Obsoletes:      perl-IO-Zlib
 Provides:       perl-Archive-Tar
 Obsoletes:      perl-Archive-Tar
-Provides:       perl-Module-Build = 0.3901
-Provides:       perl(Module::Build) = 0.3901
-Obsoletes:      perl-Module-Build < 0.3901
+Obsoletes:      perl-Module-Build <= 0.4003
 Provides:       perl-Module-Pluggable = 4.0
 Obsoletes:      perl-Module-Pluggable < 4.0
 Provides:       perl-Locale-Maketext-Simple = 0.21
@@ -98,6 +94,11 @@ Obsoletes:      perl-Pod-Simple < 3.2
 Provides:       perl-ExtUtils-ParseXS
 Obsoletes:      perl-ExtUtils-ParseXS
 Provides:       perl-version
+Obsoletes:      perl-CPAN-Meta <= 2.120921
+Obsoletes:      perl-CPAN-Meta-YAML <= 0.008
+Obsoletes:      perl-ExtUtils-CBuilder <= 0.280205
+Obsoletes:      perl-Parse-CPAN-Meta <= 1.4404
+Obsoletes:      perl-PathTools <= 3.40
 Obsoletes:      perl-version
 
 %description
@@ -147,6 +148,8 @@ Provides:       perl:/usr/share/man/man3/CORE.3pm.gz
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
+Provides:       perl-macros = 2.0
+Obsoletes:      perl-macros < 2.0
 
 %description doc
 Perl man pages and pod files.