Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2017-06-18 13:48:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm" Sun Jun 18 13:48:19 2017 rev:246 rq:503706 version:4.13.0.1 Changes: -------- rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-05-17 10:45:24.578323761 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-06-18 13:48:28.950927105 +0200 @@ -1,0 +2,7 @@ +Fri Jun 9 15:33:01 UTC 2017 - [email protected] + +- Add patch to handle newer package statement variations for Perl + 5.12+ + * perlprov-package.diff + +------------------------------------------------------------------- New: ---- perlprov-package.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ rpm-python.spec: same change ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.SGKUzv/_old 2017-06-18 13:48:32.274459450 +0200 +++ /var/tmp/diff_new_pack.SGKUzv/_new 2017-06-18 13:48:32.278458888 +0200 @@ -145,6 +145,7 @@ Patch101: nobfd.diff Patch102: emptymanifest.diff Patch103: find-lang-qt-qm.patch +Patch104: perlprov-package.diff Patch6464: auto-config-update-aarch64-ppc64le.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -240,7 +241,7 @@ %patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 85 %patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99 -%patch -P 100 -P 101 -P 102 -P 103 +%patch -P 100 -P 101 -P 102 -P 103 -P 104 %ifarch aarch64 ppc64le %patch6464 ++++++ perlprov-package.diff ++++++ Support package statements like "package 1.2.3;" and "package 1.2.3 {", which are new in Perl 5.12 and 5.14 --- ./scripts/perl.prov.orig 2017-06-09 15:20:11.869617486 +0200 +++ ./scripts/perl.prov 2017-06-09 15:04:59.840952250 +0200 @@ -129,9 +129,9 @@ # package name so we report all namespaces except some common # false positives as if they were provided packages (really ugly). - if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) { + if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*(?:v?([0-9_.]+)\s*)?[;{]/) { $package = $1; - undef $version; + $version = $2; if ($package eq 'main') { undef $package; } else { @@ -139,7 +139,7 @@ # the package definition is broken up over multiple blocks. # In that case, don't stomp a previous $VERSION we might have # found. (See BZ#214496.) - $require{$package} = undef unless (exists $require{$package}); + $require{$package} = $version unless (exists $require{$package}); } }
