From 31143cb62e69fac270fecff30331c79cf034cc140f1628c352d6c208760ed8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Tue, 24 Jan 2023 13:51:13 +0000 Subject: [PATCH 1/2] Accepting request 1060645 from home:pgajdos - add repack script, do not include packaging/ dir in sources [gh#wxWidgets/Phoenix#2105], [bsc#670523] OBS-URL: https://build.opensuse.org/request/show/1060645 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/python-wxPython?expand=0&rev=36 --- python-wxPython.changes | 6 ++++++ python-wxPython.spec | 4 ++++ repack | 4 ++++ wxPython-4.2.0.tar.gz | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 repack diff --git a/python-wxPython.changes b/python-wxPython.changes index 642c2e3..06096f7 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 17 13:51:03 UTC 2023 - pgajdos@suse.com + +- add repack script, do not include packaging/ dir in sources + [gh#wxWidgets/Phoenix#2105], [bsc#670523] + ------------------------------------------------------------------- Mon Dec 5 13:07:46 UTC 2022 - Daniel Garcia diff --git a/python-wxPython.spec b/python-wxPython.spec index 1dcc17b..8889781 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -185,6 +185,10 @@ Provides translations to the package %{name}. %prep %autosetup -n wxPython-%{version} -p1 +# https://github.com/wxWidgets/Phoenix/issues/2105 +# https://bugzilla.suse.com/show_bug.cgi?id=670523 +find -iname *.dll | grep . && \ + { echo "please run repack script (gh#2105)"; exit 1; } # Lower minimum Python version sed -i -e '/check_python_version/ s@3,7,0@3,6,0@' wscript diff --git a/repack b/repack new file mode 100644 index 0000000..ec8d3c2 --- /dev/null +++ b/repack @@ -0,0 +1,4 @@ +#!/bin/sh +tar -xzf wxPython-*.gz +rm -r wxPython-*/packaging +tar -czf wxPython-*.gz wxPython-*/ diff --git a/wxPython-4.2.0.tar.gz b/wxPython-4.2.0.tar.gz index 395f11b..5a9eb49 100644 --- a/wxPython-4.2.0.tar.gz +++ b/wxPython-4.2.0.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7 -size 70958238 +oid sha256:d6acf173f2da47a196d7382f2bc2e9e7ab1b60aad2e1b070c852e6f65014d249 +size 69608910 From 8f8fd9cff504e6a28cc40d3e76375274c9fc3680ed35ecb189aab652c14705d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Thu, 26 Jan 2023 20:49:26 +0000 Subject: [PATCH 2/2] Accepting request 1061161 from home:pgajdos - add repack script to sources in spec file OBS-URL: https://build.opensuse.org/request/show/1061161 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/python-wxPython?expand=0&rev=37 --- python-wxPython.changes | 5 +++++ python-wxPython.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-wxPython.changes b/python-wxPython.changes index 06096f7..67abe50 100644 --- a/python-wxPython.changes +++ b/python-wxPython.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 26 09:14:45 UTC 2023 - pgajdos@suse.com + +- add repack script to sources in spec file + ------------------------------------------------------------------- Tue Jan 17 13:51:03 UTC 2023 - pgajdos@suse.com diff --git a/python-wxPython.spec b/python-wxPython.spec index 8889781..3ad51e3 100644 --- a/python-wxPython.spec +++ b/python-wxPython.spec @@ -87,8 +87,10 @@ Summary: The "Phoenix" variant of the wxWidgets Python bindings License: GPL-2.0-or-later Group: System/Libraries URL: https://github.com/wxWidgets/Phoenix -Source: https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%{version}.tar.gz +# repacked https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%%{version}.tar.gz +Source0: wxPython-%{version}.tar.gz Source1: python-wxPython-rpmlintrc +Source2: repack # PATCH-FIX-OPENSUSE Patch1: use_stl_build.patch # PATCH-FIX-UPSTREAM