From 54171b535f4ae47ce4ecb5d5b5a56b5be29dfb709ab00bad8467688aba5d5d85 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 9 Dec 2015 11:12:36 +0000 Subject: [PATCH] Accepting request 347821 from home:dstoecker:branches:devel:languages:perl Prevent wrong provides in perl, which break version requires for these two packages Math::BigInt and DB. OBS-URL: https://build.opensuse.org/request/show/347821 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=133 --- perl-5.22.0_wrong_rpm_provides.diff | 26 ++++++++++++++++++++++++++ perl.changes | 6 ++++++ perl.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 perl-5.22.0_wrong_rpm_provides.diff diff --git a/perl-5.22.0_wrong_rpm_provides.diff b/perl-5.22.0_wrong_rpm_provides.diff new file mode 100644 index 0000000..ccb839b --- /dev/null +++ b/perl-5.22.0_wrong_rpm_provides.diff @@ -0,0 +1,26 @@ +diff -ur perl-5.22.0/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm perl-5.22.0_fix/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm +--- perl-5.22.0/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2015-05-13 22:19:29.000000000 +0200 ++++ perl-5.22.0_fix/dist/Math-BigInt/lib/Math/BigInt/CalcEmu.pm 2015-12-07 17:56:35.717373572 +0100 +@@ -7,7 +7,8 @@ + + $VERSION = '1.9997'; + +-package Math::BigInt; ++package Math::BigInt # line break to prevent wrong rpm provides ++; + + # See SYNOPSIS below. + +diff -ur perl-5.22.0/lib/sigtrap.pm perl-5.22.0_fix/lib/sigtrap.pm +--- perl-5.22.0/lib/sigtrap.pm 2015-05-13 22:19:30.000000000 +0200 ++++ perl-5.22.0_fix/lib/sigtrap.pm 2015-12-07 17:56:26.971631933 +0100 +@@ -80,7 +80,8 @@ + } + + sub handler_traceback { +- package DB; # To get subroutine args. ++ package DB # line break to prevent wrong rpm provides ++ ; # To get subroutine args. + $SIG{'ABRT'} = DEFAULT; + kill 'ABRT', $$ if $panic++; + syswrite(STDERR, 'Caught a SIG', 12); diff --git a/perl.changes b/perl.changes index 9e60f2e..551f378 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 7 16:58:56 UTC 2015 - opensuse@dstoecker.de + +- prevent bad RPM provides for Math::BigInt and DB + (patch file perl-5.22.0_wrong_rpm_provides.diff) + ------------------------------------------------------------------- Mon Jun 22 06:47:41 UTC 2015 - dimstar@opensuse.org diff --git a/perl.spec b/perl.spec index 160188f..628f81b 100644 --- a/perl.spec +++ b/perl.spec @@ -36,6 +36,8 @@ Patch3: perl-nroff.diff Patch4: perl-netcmdutf8.diff Patch5: perl-HiRes.t-timeout.diff Patch6: perl-saverecontext.diff +# PATCH-FIX-OPENSUSE perl-5.22.0_wrong_rpm_provides.diff Prevent generating bad RPM provides +Patch7: perl-5.22.0_wrong_rpm_provides.diff Patch8: skip_time_hires.patch Patch9: perl-incfix.diff Patch11: perl-5.18.2-overflow.diff @@ -174,6 +176,7 @@ cp -p %{S:3} . %patch4 %patch5 %patch6 +%patch7 -p1 %ifarch ppc ppc64 %patch8 -p1 %endif