From ebfe582a19e5680ab0d1886ed51c26be3f0936104753509f6ac724915a77e1c3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 11 Feb 2015 16:53:14 +0000 Subject: [PATCH] Accepting request 284788 from home:coolo:bc Note that it still fails here due to timestamps - use rm with -f to avoid prompts for rpmbuild in terminals OBS-URL: https://build.opensuse.org/request/show/284788 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=126 --- perl.changes | 5 ++++ perl.spec | 68 ++++++++++++++++++++++++++-------------------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/perl.changes b/perl.changes index cf7c3ac..09ff1d4 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 5 07:44:14 UTC 2015 - coolo@suse.com + +- use rm with -f to avoid prompts for rpmbuild in terminals + ------------------------------------------------------------------- Wed Sep 17 14:22:41 CEST 2014 - mls@suse.de diff --git a/perl.spec b/perl.spec index d02530e..c88a836 100644 --- a/perl.spec +++ b/perl.spec @@ -1,7 +1,7 @@ # # spec file for package perl # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -253,9 +253,9 @@ popd d="`gcc -print-file-name=include`" test -f "$d/stdarg.h" && (cd $d ; $RPM_BUILD_ROOT/usr/bin/perl -I$cp -I$cpa $RPM_BUILD_ROOT/usr/bin/h2ph -d $vpa stdarg.h stddef.h float.h) # remove broken pm - we don't have the module -rm $RPM_BUILD_ROOT/usr/lib/perl5/*/Pod/Perldoc/ToTk.pm +rm -f $RPM_BUILD_ROOT/usr/lib/perl5/*/Pod/Perldoc/ToTk.pm # we don't need this in here -rm $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a +rm -f $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a #touch $RPM_BUILD_ROOT/usr/share/man/man3/perllocal.3pm #touch $cpa/perllocal.pod # test CVE-2007-5116 @@ -264,37 +264,37 @@ $RPM_BUILD_ROOT/usr/bin/perl -e '$r=chr(128)."\\x{100}";/$r/' $RPM_BUILD_ROOT/usr/bin/perl -e 'eval "/\\6666666666/"' %if 0 # remove unrelated target/os manpages -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlapollo.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlbeos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlbs2000.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlcygwin.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perldgux.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perldos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlepoc.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlfreebsd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlhpux.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlhurd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlirix.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmachten.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmacos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmacosx.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlmint.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlnetware.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlopenbsd.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos2.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos390.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlos400.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlplan9.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlqnx.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlsolaris.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perltru64.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perluts.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvmesa.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvms.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvos.1* -rm $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlapollo.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlbeos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlbs2000.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlcygwin.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perldgux.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perldos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlepoc.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlfreebsd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlhpux.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlhurd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlirix.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmachten.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmacos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmacosx.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlmint.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlnetware.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlopenbsd.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos2.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos390.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlos400.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlplan9.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlqnx.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlsolaris.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perltru64.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perluts.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvmesa.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvms.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlvos.1* +rm -f $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1* %endif cat << EOF > perl-base-filelist /usr/lib/perl5/%pversion/B/Deparse.pm