From 862e90c73629f2abe9222c3359c67510654c16bd6e4c80a5e9dc90ac25aab069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 8 Jan 2016 09:08:20 +0000 Subject: [PATCH] Accepting request 352472 from home:bmwiedemann:branches:devel:languages:perl - fix perl_gen_filelist macro to not fail on foo.1 man page e.g. https://build.opensuse.org/package/show/devel:languages:perl/perl-Pod-Parser failed builds from this and is tested to be fixed OBS-URL: https://build.opensuse.org/request/show/352472 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=135 --- macros.perl | 2 +- perl.changes | 5 +++++ perl.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/macros.perl b/macros.perl index 5b979f0..1d8124d 100644 --- a/macros.perl +++ b/macros.perl @@ -113,7 +113,7 @@ 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 \ +for file in `cd "${RPM_BUILD_ROOT}%{_mandir}" && find . -type f -name "*3pm*"`; 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 \ diff --git a/perl.changes b/perl.changes index 551f378..019887c 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 7 16:12:11 UTC 2016 - bwiedemann@suse.com + +- fix perl_gen_filelist macro to not fail on foo.1 man page + ------------------------------------------------------------------- Mon Dec 7 16:58:56 UTC 2015 - opensuse@dstoecker.de diff --git a/perl.spec b/perl.spec index 628f81b..37bb344 100644 --- a/perl.spec +++ b/perl.spec @@ -1,7 +1,7 @@ # # spec file for package perl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed