From 6e750a266d2021497b0b2d22d11d80f603b218c37ca692ea3f5d2228f879569c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 11 Jun 2013 13:10:30 +0000 Subject: [PATCH] - moving the provides of perl-macros to perl-doc so we can check for duplicated man pages in the gen_filelist macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=93 --- macros.perl | 5 +++++ perl.changes | 6 ++++++ perl.spec | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/macros.perl b/macros.perl index 008e85e..c1cc0b9 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 719c713..e7df65d 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/perl.spec b/perl.spec index eb31ad7..8e95bca 100644 --- a/perl.spec +++ b/perl.spec @@ -52,10 +52,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 @@ -149,6 +147,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.