Hello community, here is the log from the commit of package perl-Wx for openSUSE:Factory checked in at 2018-06-29 22:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Wx (Old) and /work/SRC/openSUSE:Factory/.perl-Wx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Wx" Fri Jun 29 22:28:41 2018 rev:9 rq:617445 version:0.9932 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Wx/perl-Wx.changes 2017-07-07 10:18:04.249211337 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Wx.new/perl-Wx.changes 2018-06-29 22:28:46.906375385 +0200 @@ -1,0 +2,19 @@ +Wed Jun 13 15:36:14 UTC 2018 - [email protected] + +- No need to add an explicit Requires specifying the version, as the + soname on SUSE includes the full version since WxWidgets 3.0.4 +- Drop conditionals handling obsolete releases, or releases lacking + the dependencies (e.g. SLE 11). +- Reproducible build: + * Add 0003-Define-overload-constants-in-sorted-order.patch + * Add 0004-Define-enum-values-in-sorted-order.patch + +------------------------------------------------------------------- +Tue May 28 18:55:57 UTC 2018 - [email protected] + +- Fix the wxWidgets requirements. Instead of listing each version + for every *SUSE flavor, we're now calling rpmqpack to find the + correct dependency. +- Update cpanspec.yml accordingly. + +------------------------------------------------------------------- New: ---- 0003-Define-overload-constants-in-sorted-order.patch 0004-Define-enum-values-in-sorted-order.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Wx.spec ++++++ --- /var/tmp/diff_new_pack.xxWDsk/_old 2018-06-29 22:28:47.626374838 +0200 +++ /var/tmp/diff_new_pack.xxWDsk/_new 2018-06-29 22:28:47.626374838 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Wx # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -21,16 +21,18 @@ Release: 0 %define cpan_name Wx Summary: Interface to the Wxwidgets Cross-Platform Gui Toolkit -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-1.0 OR GPL-1.0-or-later Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Wx/ Source0: https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/%{cpan_name}-%{version}.tar.gz Source1: perl-Wx-rpmlintrc Source2: cpanspec.yml -Patch0: 0001-fix-incomplete-Wx_Exp.pm-due-to-missing-dependecy-in.patch -Patch1: 0001-Sort-output-of-dumped-dictionaries-for-reproducible-.patch -Patch2: 0002-Provide-overload-methods-to-XSpp-in-sorted-order.patch -Patch3: fix_wxWidgets_3_0_3_API_break.patch +Patch0: 0001-Sort-output-of-dumped-dictionaries-for-reproducible-.patch +Patch1: 0002-Provide-overload-methods-to-XSpp-in-sorted-order.patch +Patch2: 0003-Define-overload-constants-in-sorted-order.patch +Patch3: 0004-Define-enum-values-in-sorted-order.patch +Patch4: 0001-fix-incomplete-Wx_Exp.pm-due-to-missing-dependecy-in.patch +Patch5: fix_wxWidgets_3_0_3_API_break.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -45,17 +47,10 @@ %{perl_requires} # MANUAL BEGIN BuildRequires: gcc-c++ -%if 0%{?suse_version} > 1320 -# upstream wxWidgets broke API between 3.0.2 and 3.0.3 ... -BuildRequires: wxWidgets-3_0-nostl-devel >= 3.0.3 -Requires: libwx_baseu-suse-nostl3 >= 3.0.3 -%else -%if 0%{?sle_version} >= 120200 -BuildRequires: wxWidgets-3_0-nostl-devel <= 3.0.2 -Requires: libwx_baseu-suse-nostl3 <= 3.0.2 -%else -BuildRequires: wxWidgets-ansi-devel -%endif +BuildRequires: wxWidgets-3_0-nostl-devel +%if 0%{?suse_version} <= 1500 +# Since WxWidgets 3.0.4, the full version is encoded in the soname +Requires: %(rpmqpack | grep libwx_baseu-suse-nostl) %endif BuildRequires: xspp # MANUAL END @@ -74,6 +69,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" ++++++ 0003-Define-overload-constants-in-sorted-order.patch ++++++ >From ce957a4fdf2cb6fc6821b6ee791f6d3876e88b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Fri, 15 Jun 2018 00:58:32 +0200 Subject: [PATCH 3/3] Define overload constants in sorted order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Brüns <[email protected]> --- build/Wx/Overload/Driver.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Wx/Overload/Driver.pm b/build/Wx/Overload/Driver.pm index 0d2d383..8d49ba2 100644 --- a/build/Wx/Overload/Driver.pm +++ b/build/Wx/Overload/Driver.pm @@ -174,7 +174,7 @@ EOT EOT - foreach my $i ( grep { $name2type{$_} ne '1' } keys %name2type ) { + foreach my $i ( grep { $name2type{$_} ne '1' } sort keys %name2type ) { print $out <<EOT; #define wxPliOvl${i} "$name2type{$i}" EOT -- 2.17.1 ++++++ 0004-Define-enum-values-in-sorted-order.patch ++++++ >From d16adc83898678e33ce094c71440d7204530a628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Fri, 15 Jun 2018 01:39:44 +0200 Subject: [PATCH 4/4] Define enum values in sorted order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Brüns <[email protected]> --- build/Wx/XSP/Enum.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Wx/XSP/Enum.pm b/build/Wx/XSP/Enum.pm index efaf9ba..9f55b9c 100644 --- a/build/Wx/XSP/Enum.pm +++ b/build/Wx/XSP/Enum.pm @@ -45,7 +45,8 @@ sub post_process { ( my $name = File::Basename::basename( $parser->current_file ) ) =~ tr/./_/; my $file = "xspp/const_$name.h"; my @defines; - while( my( $k, $v ) = each %constants ) { + foreach my $k (sort keys %constants) { + my $v = $constants{$k}; if( $v->[0] ) { push @defines, "#ifdef $v->[0]", " r( $k );", -- 2.17.1 ++++++ cpanspec.yml ++++++ --- /var/tmp/diff_new_pack.xxWDsk/_old 2018-06-29 22:28:47.670374806 +0200 +++ /var/tmp/diff_new_pack.xxWDsk/_new 2018-06-29 22:28:47.670374806 +0200 @@ -7,16 +7,17 @@ # Needed for reproducible build 0001-Sort-output-of-dumped-dictionaries-for-reproducible-.patch: -p1 0002-Provide-overload-methods-to-XSpp-in-sorted-order.patch: -p1 + 0003-Define-overload-constants-in-sorted-order.patch: -p1 + 0004-Define-enum-values-in-sorted-order.patch: -p1 # Fix for incomplete Wx_Exp.pm, https://rt.cpan.org/Public/Bug/Display.html?id=120657 0001-fix-incomplete-Wx_Exp.pm-due-to-missing-dependecy-in.patch: -p1 -# foo.patch: -p1 -# bar.patch: + fix_wxWidgets_3_0_3_API_break.patch: -p1 preamble: |- BuildRequires: gcc-c++ - %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 BuildRequires: wxWidgets-3_0-nostl-devel - %else - BuildRequires: wxWidgets-ansi-devel + %if 0%{?suse_version} <= 1500 + # Since WxWidgets 3.0.4, the full version is encoded in the soname + Requires: %(rpmqpack | grep libwx_baseu-suse-nostl) %endif BuildRequires: xspp #post_prep: |-
