From 6cf9073848106a76a74bcd235251b2b1ac65ff16 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 01/57] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- veusz.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 144d358..46ce53e 100644 --- a/veusz.spec +++ b/veusz.spec @@ -3,7 +3,6 @@ Version: 3.0.1 Release: 1%{?dist} Summary: GUI scientific plotting package -Group: Applications/Productivity # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ From 101f3d527042f75c3b9c1820ce55001aa12217b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:14:15 +0000 Subject: [PATCH 02/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 46ce53e..bf2c37d 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Jul 22 2018 Jeremy Sanders - 3.0.1-1 - Update to Veusz 3.0.1 - Remove xvfb dependency on build From ba78d513ab7950af367bfdf7557b168dd7661818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 13 Feb 2019 01:09:59 +0100 Subject: [PATCH 03/57] https://fedoraproject.org/wiki/Changes/Python_Extension_Flags --- veusz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index bf2c37d..90d89bf 100644 --- a/veusz.spec +++ b/veusz.spec @@ -50,7 +50,7 @@ sed -i '/^#!/d' veusz/veusz_main.py sed -i '/^#!/d' veusz/veusz_listen.py %build -CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build +%py3_build %install rm -rf %{buildroot} From 48d63656b65a5bdcf0da95dba8fe48678833c201 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:56:17 +0000 Subject: [PATCH 04/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 90d89bf..86c07a4 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 101ffc65afa5dcf68c3a33f8c99912e679957de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:09:03 +0200 Subject: [PATCH 05/57] Rebuilt for Python 3.8 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 86c07a4..b3fed0a 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Mon Aug 19 2019 Miro Hrončok - 3.0.1-4 +- Rebuilt for Python 3.8 + * Sat Jul 27 2019 Fedora Release Engineering - 3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3d017b3e3b8670a456f7be4437991863656c4fce Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Mon, 19 Aug 2019 14:39:07 +0100 Subject: [PATCH 06/57] Patch to fix use of longs in new Python (fix for RHBZ#1736948) --- py-long.patch | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++ veusz.spec | 7 +- 2 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 py-long.patch diff --git a/py-long.patch b/py-long.patch new file mode 100644 index 0000000..4280212 --- /dev/null +++ b/py-long.patch @@ -0,0 +1,179 @@ +From 09265480ec7eeb491da98f43d5e11ec9174e7afa Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Thu, 4 Apr 2019 09:17:40 +0300 +Subject: [PATCH] Use unsigned long for widget ids instead of signed long + +Python's id() function returns memory addresses, which do not fit into +signed long on 32-bit systems. + +In PyQt 5.12 overflow checking is enabled by default, so this causes +errors like this: + +Traceback (most recent call last): + [...] + File "/usr/lib/python3/dist-packages/veusz/widgets/graph3d.py", line 246, in drawToObject + cont.assignWidgetId(id(self)) +OverflowError: argument 1 overflowed: value must be in the range -2147483648 to 2147483647 +--- + veusz/helpers/src/threed/objects.cpp | 4 ++-- + veusz/helpers/src/threed/objects.h | 8 ++++---- + veusz/helpers/src/threed/scene.cpp | 16 ++++++++-------- + veusz/helpers/src/threed/scene.h | 6 +++--- + veusz/helpers/src/threed/threed.sip | 16 ++++++++-------- + 5 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/veusz/helpers/src/threed/objects.cpp b/veusz/helpers/src/threed/objects.cpp +index 3293012e..c32702e6 100644 +--- a/veusz/helpers/src/threed/objects.cpp ++++ b/veusz/helpers/src/threed/objects.cpp +@@ -31,7 +31,7 @@ void Object::getFragments(const Mat4& perspM, const Mat4& outerM, FragmentVector + { + } + +-void Object::assignWidgetId(long id) ++void Object::assignWidgetId(unsigned long id) + { + widgetid = id; + } +@@ -729,7 +729,7 @@ void ObjectContainer::getFragments(const Mat4& perspM, const Mat4& outerM, Fragm + objects[i]->getFragments(perspM, totM, v); + } + +-void ObjectContainer::assignWidgetId(long id) ++void ObjectContainer::assignWidgetId(unsigned long id) + { + for(auto &object : objects) + object->assignWidgetId(id); +diff --git a/veusz/helpers/src/threed/objects.h b/veusz/helpers/src/threed/objects.h +index 68f4f0d6..147c52ab 100644 +--- a/veusz/helpers/src/threed/objects.h ++++ b/veusz/helpers/src/threed/objects.h +@@ -33,17 +33,17 @@ + class Object + { + public: +- Object() : widgetid(-1) {} ++ Object() : widgetid(0) {} + + virtual ~Object(); + + virtual void getFragments(const Mat4& perspM, const Mat4& outerM, FragmentVector& v); + + // recursive set id of child objects +- virtual void assignWidgetId(long id); ++ virtual void assignWidgetId(unsigned long id); + + // id of widget which generated object +- long widgetid; ++ unsigned long widgetid; + }; + + class Triangle : public Object +@@ -298,7 +298,7 @@ class ObjectContainer : public Object + } + + // recursive set id of child objects +- void assignWidgetId(long id); ++ void assignWidgetId(unsigned long id); + + public: + Mat4 objM; +diff --git a/veusz/helpers/src/threed/scene.cpp b/veusz/helpers/src/threed/scene.cpp +index 3bb88f4d..83730360 100644 +--- a/veusz/helpers/src/threed/scene.cpp ++++ b/veusz/helpers/src/threed/scene.cpp +@@ -528,12 +528,12 @@ Scene::DrawCallback::~DrawCallback() + { + } + +-long Scene::idPixel(Object* root, +- QPainter* painter, +- const Camera& cam, +- double x1, double y1, double x2, double y2, +- double scale, +- double scaling, int x, int y) ++unsigned long Scene::idPixel(Object* root, ++ QPainter* painter, ++ const Camera& cam, ++ double x1, double y1, double x2, double y2, ++ double scale, ++ double scaling, int x, int y) + { + constexpr int box = 3; + +@@ -543,7 +543,7 @@ long Scene::idPixel(Object* root, + { + public: + IdDrawCallback() +- : lastwidgetid(-1), ++ : lastwidgetid(0), + pixrender(2*box+1,2*box+1) + { + pixrender.fill(QColor(254,254,254)); +@@ -565,7 +565,7 @@ long Scene::idPixel(Object* root, + } + } + +- long lastwidgetid; ++ unsigned long lastwidgetid; + QPixmap pixrender; + QImage lastimage; + }; +diff --git a/veusz/helpers/src/threed/scene.h b/veusz/helpers/src/threed/scene.h +index 108d58c7..60afa84e 100644 +--- a/veusz/helpers/src/threed/scene.h ++++ b/veusz/helpers/src/threed/scene.h +@@ -66,9 +66,9 @@ class Scene + double x1, double y1, double x2, double y2, double scale); + + // find widget id of pixel painted by drawing scene at (x, y) +- long idPixel(Object* root, QPainter* painter, const Camera& cam, +- double x1, double y1, double x2, double y2, double scale, +- double scaling, int x, int y); ++ unsigned long idPixel(Object* root, QPainter* painter, const Camera& cam, ++ double x1, double y1, double x2, double y2, double scale, ++ double scaling, int x, int y); + + public: + // last screen matrix +diff --git a/veusz/helpers/src/threed/threed.sip b/veusz/helpers/src/threed/threed.sip +index 385fc6eb..2903e096 100644 +--- a/veusz/helpers/src/threed/threed.sip ++++ b/veusz/helpers/src/threed/threed.sip +@@ -324,8 +324,8 @@ class Object /NoDefaultCtors/ + %End + public: + virtual ~Object(); +- virtual void assignWidgetId(long id); +- long widgetid; ++ virtual void assignWidgetId(unsigned long id); ++ unsigned long widgetid; + }; + + class Triangle : public Object /NoDefaultCtors/ +@@ -446,7 +446,7 @@ class ObjectContainer : public Object + public: + ObjectContainer(); + void addObject(Object* obj /Transfer/); +- void assignWidgetId(long id); ++ void assignWidgetId(unsigned long id); + + Mat4 objM; + }; +@@ -538,11 +538,11 @@ class Scene + void render(Object* root, + QPainter* painter, const Camera& cam, + double x1, double y1, double x2, double y2, double scale); +- long idPixel(Object* root, +- QPainter* painter, const Camera& cam, +- double x1, double y1, double x2, double y2, +- double scale, +- double scaling, int x, int y); ++ unsigned long idPixel(Object* root, ++ QPainter* painter, const Camera& cam, ++ double x1, double y1, double x2, double y2, ++ double scale, ++ double scaling, int x, int y); + + public: + Mat3 screenM; diff --git a/veusz.spec b/veusz.spec index b3fed0a..908b431 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,12 +1,13 @@ Name: veusz Version: 3.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz +Patch0: py-long.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -42,6 +43,7 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} +%patch0 -p1 find -name \*~ | xargs rm -f # remove shebangs from scripts which aren't installed @@ -124,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Mon Aug 19 2019 Jeremy Sanders - 3.0.1-5 +- Patch for bug to fix RHBZ#1736948 (build failure on rawhide) + * Mon Aug 19 2019 Miro Hrončok - 3.0.1-4 - Rebuilt for Python 3.8 From d3e3b8e82d8f28e3dac7299324985be7ab0ae635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 16:36:28 +0200 Subject: [PATCH 07/57] Rebuilt for Python 3.8 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 908b431..b51ac88 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -126,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Mon Aug 19 2019 Miro Hrončok - 3.0.1-6 +- Rebuilt for Python 3.8 + * Mon Aug 19 2019 Jeremy Sanders - 3.0.1-5 - Patch for bug to fix RHBZ#1736948 (build failure on rawhide) From d675dc41d98b5b829d193540aa9718b0afb8fa06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:41:12 +0200 Subject: [PATCH 08/57] Rebuilt for Python 3.8.0rc1 (#1748018) --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index b51ac88..553c8a9 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -126,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Thu Oct 03 2019 Miro Hrončok - 3.0.1-7 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Mon Aug 19 2019 Miro Hrončok - 3.0.1-6 - Rebuilt for Python 3.8 From f91cafc26591c25f4d5d69790c9dbefe1078ea1f Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 27 Oct 2019 10:08:11 +0100 Subject: [PATCH 09/57] Update to Veusz 3.1 --- .gitignore | 1 + sources | 2 +- veusz.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d2fc191..22bd2c9 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ veusz-1.8.tar.gz /veusz-2.2.2.tar.gz /veusz-3.0.tar.gz /veusz-3.0.1.tar.gz +/veusz-3.1.tar.gz diff --git a/sources b/sources index 2d02ded..07ca682 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.0.1.tar.gz) = 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238 +SHA512 (veusz-3.1.tar.gz) = 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4 diff --git a/veusz.spec b/veusz.spec index 553c8a9..1eef6d1 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,20 +1,19 @@ Name: veusz -Version: 3.0.1 -Release: 7%{?dist} +Version: 3.1 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz -Patch0: py-long.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools BuildRequires: python3-numpy BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel -BuildRequires: python3-sip python3-sip-devel sip-devel +BuildRequires: python3-pyqt5-sip python3-sip-devel sip BuildRequires: python3-h5py python3-astropy BuildRequires: desktop-file-utils @@ -43,7 +42,6 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} -%patch0 -p1 find -name \*~ | xargs rm -f # remove shebangs from scripts which aren't installed @@ -126,6 +124,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Oct 27 2019 Jeremy Sanders - 3.1-1 +- Update to Veusz 3.1 +- Remove old sip-devel dependency + * Thu Oct 03 2019 Miro Hrončok - 3.0.1-7 - Rebuilt for Python 3.8.0rc1 (#1748018) From d39ac64620cc9f1be8ae878b1428d1122554d3b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:05:40 +0000 Subject: [PATCH 10/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 1eef6d1..c5871f7 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Oct 27 2019 Jeremy Sanders - 3.1-1 - Update to Veusz 3.1 - Remove old sip-devel dependency From 4b37c853760e47ed56ae43fd2c9f5eeb7a3d7716 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 8 Mar 2020 19:46:49 +0000 Subject: [PATCH 11/57] Update to Veusz 3.2 --- .gitignore | 1 + py-long.patch | 179 -------------------------------------------------- sources | 2 +- veusz.spec | 8 ++- 4 files changed, 8 insertions(+), 182 deletions(-) delete mode 100644 py-long.patch diff --git a/.gitignore b/.gitignore index 22bd2c9..36b1f67 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ veusz-1.8.tar.gz /veusz-3.0.tar.gz /veusz-3.0.1.tar.gz /veusz-3.1.tar.gz +/veusz-3.2.tar.gz diff --git a/py-long.patch b/py-long.patch deleted file mode 100644 index 4280212..0000000 --- a/py-long.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 09265480ec7eeb491da98f43d5e11ec9174e7afa Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Thu, 4 Apr 2019 09:17:40 +0300 -Subject: [PATCH] Use unsigned long for widget ids instead of signed long - -Python's id() function returns memory addresses, which do not fit into -signed long on 32-bit systems. - -In PyQt 5.12 overflow checking is enabled by default, so this causes -errors like this: - -Traceback (most recent call last): - [...] - File "/usr/lib/python3/dist-packages/veusz/widgets/graph3d.py", line 246, in drawToObject - cont.assignWidgetId(id(self)) -OverflowError: argument 1 overflowed: value must be in the range -2147483648 to 2147483647 ---- - veusz/helpers/src/threed/objects.cpp | 4 ++-- - veusz/helpers/src/threed/objects.h | 8 ++++---- - veusz/helpers/src/threed/scene.cpp | 16 ++++++++-------- - veusz/helpers/src/threed/scene.h | 6 +++--- - veusz/helpers/src/threed/threed.sip | 16 ++++++++-------- - 5 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/veusz/helpers/src/threed/objects.cpp b/veusz/helpers/src/threed/objects.cpp -index 3293012e..c32702e6 100644 ---- a/veusz/helpers/src/threed/objects.cpp -+++ b/veusz/helpers/src/threed/objects.cpp -@@ -31,7 +31,7 @@ void Object::getFragments(const Mat4& perspM, const Mat4& outerM, FragmentVector - { - } - --void Object::assignWidgetId(long id) -+void Object::assignWidgetId(unsigned long id) - { - widgetid = id; - } -@@ -729,7 +729,7 @@ void ObjectContainer::getFragments(const Mat4& perspM, const Mat4& outerM, Fragm - objects[i]->getFragments(perspM, totM, v); - } - --void ObjectContainer::assignWidgetId(long id) -+void ObjectContainer::assignWidgetId(unsigned long id) - { - for(auto &object : objects) - object->assignWidgetId(id); -diff --git a/veusz/helpers/src/threed/objects.h b/veusz/helpers/src/threed/objects.h -index 68f4f0d6..147c52ab 100644 ---- a/veusz/helpers/src/threed/objects.h -+++ b/veusz/helpers/src/threed/objects.h -@@ -33,17 +33,17 @@ - class Object - { - public: -- Object() : widgetid(-1) {} -+ Object() : widgetid(0) {} - - virtual ~Object(); - - virtual void getFragments(const Mat4& perspM, const Mat4& outerM, FragmentVector& v); - - // recursive set id of child objects -- virtual void assignWidgetId(long id); -+ virtual void assignWidgetId(unsigned long id); - - // id of widget which generated object -- long widgetid; -+ unsigned long widgetid; - }; - - class Triangle : public Object -@@ -298,7 +298,7 @@ class ObjectContainer : public Object - } - - // recursive set id of child objects -- void assignWidgetId(long id); -+ void assignWidgetId(unsigned long id); - - public: - Mat4 objM; -diff --git a/veusz/helpers/src/threed/scene.cpp b/veusz/helpers/src/threed/scene.cpp -index 3bb88f4d..83730360 100644 ---- a/veusz/helpers/src/threed/scene.cpp -+++ b/veusz/helpers/src/threed/scene.cpp -@@ -528,12 +528,12 @@ Scene::DrawCallback::~DrawCallback() - { - } - --long Scene::idPixel(Object* root, -- QPainter* painter, -- const Camera& cam, -- double x1, double y1, double x2, double y2, -- double scale, -- double scaling, int x, int y) -+unsigned long Scene::idPixel(Object* root, -+ QPainter* painter, -+ const Camera& cam, -+ double x1, double y1, double x2, double y2, -+ double scale, -+ double scaling, int x, int y) - { - constexpr int box = 3; - -@@ -543,7 +543,7 @@ long Scene::idPixel(Object* root, - { - public: - IdDrawCallback() -- : lastwidgetid(-1), -+ : lastwidgetid(0), - pixrender(2*box+1,2*box+1) - { - pixrender.fill(QColor(254,254,254)); -@@ -565,7 +565,7 @@ long Scene::idPixel(Object* root, - } - } - -- long lastwidgetid; -+ unsigned long lastwidgetid; - QPixmap pixrender; - QImage lastimage; - }; -diff --git a/veusz/helpers/src/threed/scene.h b/veusz/helpers/src/threed/scene.h -index 108d58c7..60afa84e 100644 ---- a/veusz/helpers/src/threed/scene.h -+++ b/veusz/helpers/src/threed/scene.h -@@ -66,9 +66,9 @@ class Scene - double x1, double y1, double x2, double y2, double scale); - - // find widget id of pixel painted by drawing scene at (x, y) -- long idPixel(Object* root, QPainter* painter, const Camera& cam, -- double x1, double y1, double x2, double y2, double scale, -- double scaling, int x, int y); -+ unsigned long idPixel(Object* root, QPainter* painter, const Camera& cam, -+ double x1, double y1, double x2, double y2, double scale, -+ double scaling, int x, int y); - - public: - // last screen matrix -diff --git a/veusz/helpers/src/threed/threed.sip b/veusz/helpers/src/threed/threed.sip -index 385fc6eb..2903e096 100644 ---- a/veusz/helpers/src/threed/threed.sip -+++ b/veusz/helpers/src/threed/threed.sip -@@ -324,8 +324,8 @@ class Object /NoDefaultCtors/ - %End - public: - virtual ~Object(); -- virtual void assignWidgetId(long id); -- long widgetid; -+ virtual void assignWidgetId(unsigned long id); -+ unsigned long widgetid; - }; - - class Triangle : public Object /NoDefaultCtors/ -@@ -446,7 +446,7 @@ class ObjectContainer : public Object - public: - ObjectContainer(); - void addObject(Object* obj /Transfer/); -- void assignWidgetId(long id); -+ void assignWidgetId(unsigned long id); - - Mat4 objM; - }; -@@ -538,11 +538,11 @@ class Scene - void render(Object* root, - QPainter* painter, const Camera& cam, - double x1, double y1, double x2, double y2, double scale); -- long idPixel(Object* root, -- QPainter* painter, const Camera& cam, -- double x1, double y1, double x2, double y2, -- double scale, -- double scaling, int x, int y); -+ unsigned long idPixel(Object* root, -+ QPainter* painter, const Camera& cam, -+ double x1, double y1, double x2, double y2, -+ double scale, -+ double scaling, int x, int y); - - public: - Mat3 screenM; diff --git a/sources b/sources index 07ca682..0a839e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.1.tar.gz) = 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4 +SHA512 (veusz-3.2.tar.gz) = 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc diff --git a/veusz.spec b/veusz.spec index c5871f7..c908f99 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz -Version: 3.1 -Release: 2%{?dist} +Version: 3.2 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Mar 08 2020 Jeremy Sanders - 3.2-1 +- Update to Veusz 3.2 +- Fixes failure to build on Python 3.9 (#1794334) + * Fri Jan 31 2020 Fedora Release Engineering - 3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d6c068a6598d65ac5c2eea496681731db5e7a272 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Mon, 23 Mar 2020 17:25:07 +0000 Subject: [PATCH 12/57] Update to Veusz 3.2.1 --- .gitignore | 1 + sources | 2 +- veusz.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 36b1f67..14eeb53 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ veusz-1.8.tar.gz /veusz-3.0.1.tar.gz /veusz-3.1.tar.gz /veusz-3.2.tar.gz +/veusz-3.2.1.tar.gz diff --git a/sources b/sources index 0a839e8..e4e2d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.2.tar.gz) = 01e1a030246a3d6811493968f2f30084b2c465195af166b7bdc4009de4c488350a4fba300acee1959310b318e8dc519f090bfca528491811ca52640c33d048bc +SHA512 (veusz-3.2.1.tar.gz) = 38d31415569edb6dacebe3d0f113ad34e62832654835e6066b279168bf07653439e51f2c4ca6eca40f227302982b1c3efef7a2df315d92e93da27e586db8d517 diff --git a/veusz.spec b/veusz.spec index c908f99..4690445 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,5 +1,5 @@ Name: veusz -Version: 3.2 +Version: 3.2.1 Release: 1%{?dist} Summary: GUI scientific plotting package @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Mon Mar 23 2020 Jeremy Sanders - 3.2.1-1 +- Update to Veusz 3.2.1 + * Sun Mar 08 2020 Jeremy Sanders - 3.2-1 - Update to Veusz 3.2 - Fixes failure to build on Python 3.9 (#1794334) From 6c89b13909d70b6ce36d0dff6d552606f73c3299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:22 +0200 Subject: [PATCH 13/57] Rebuilt for Python 3.9 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 4690445..87993e0 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue May 26 2020 Miro Hrončok - 3.2.1-2 +- Rebuilt for Python 3.9 + * Mon Mar 23 2020 Jeremy Sanders - 3.2.1-1 - Update to Veusz 3.2.1 From e217f1ee5e881350a965b8ae387fef0f8b5e4939 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:39:59 +0000 Subject: [PATCH 14/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 87993e0..bb30365 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -124,6 +124,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 3.2.1-2 - Rebuilt for Python 3.9 From 0917a59248b55acb6a0135602234a0287187c315 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Wed, 2 Dec 2020 20:49:05 +0100 Subject: [PATCH 15/57] Update to Veusz-3.3. Fixes for RHBZ#1903072. --- .gitignore | 1 + py10-int.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 +- veusz.spec | 14 ++++++++-- 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 py10-int.patch diff --git a/.gitignore b/.gitignore index 14eeb53..d163ba4 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ veusz-1.8.tar.gz /veusz-3.1.tar.gz /veusz-3.2.tar.gz /veusz-3.2.1.tar.gz +/veusz-3.3.tar.gz diff --git a/py10-int.patch b/py10-int.patch new file mode 100644 index 0000000..3e8442a --- /dev/null +++ b/py10-int.patch @@ -0,0 +1,74 @@ +diff --git a/tests/comparison/multixy.vsz.selftest b/tests/comparison/multixy.vsz.selftest +index f50a4697..3fdd5d1a 100644 +--- a/tests/comparison/multixy.vsz.selftest ++++ b/tests/comparison/multixy.vsz.selftest +@@ -126,13 +126,13 @@ + + + +- ++ + + + + + +-Datasets ++Datasets + + + +diff --git a/veusz/document/painthelper.py b/veusz/document/painthelper.py +index 6a312160..6484c228 100644 +--- a/veusz/document/painthelper.py ++++ b/veusz/document/painthelper.py +@@ -41,8 +41,8 @@ class DrawState(object): + + self.widget = widget + self.record = RecordPaintDevice( +- helper.pagesize[0], helper.pagesize[1], +- helper.dpi[0], helper.dpi[1]) ++ int(helper.pagesize[0]), int(helper.pagesize[1]), ++ int(helper.dpi[0]), int(helper.dpi[1])) + self.bounds = bounds + self.clip = clip + +diff --git a/veusz/setting/collections.py b/veusz/setting/collections.py +index b5da0bf4..d7355126 100644 +--- a/veusz/setting/collections.py ++++ b/veusz/setting/collections.py +@@ -366,7 +366,7 @@ class Text(Settings): + if self.bold: + weight = qt.QFont.Bold + +- f = qt.QFont(self.font, size, weight, self.italic) ++ f = qt.QFont(self.font, int(size), weight, self.italic) + if self.underline: + f.setUnderline(True) + f.setStyleHint(qt.QFont.Times) +diff --git a/veusz/utils/textrender.py b/veusz/utils/textrender.py +index c87c0968..58f597be 100644 +--- a/veusz/utils/textrender.py ++++ b/veusz/utils/textrender.py +@@ -1520,7 +1520,7 @@ class _MmlRenderer(_Renderer): + if ptsize < 0: + ptsize = self.font.pixelSize() / self.painter.pixperpt + +- doc.setBaseFontPointSize(ptsize * upscale) ++ doc.setBaseFontPointSize(int(ptsize * upscale)) + + # the output will be painted finally scaled + self.drawscale = ( +diff --git a/veusz/widgets/key.py b/veusz/widgets/key.py +index 7c7ecfa4..b2073382 100644 +--- a/veusz/widgets/key.py ++++ b/veusz/widgets/key.py +@@ -402,7 +402,7 @@ class Key(widget.Widget): + if s.title != '': + titlefont = qt.QFont(font) + painter.setPen(textpen) +- titlefont.setPointSize( ++ titlefont.setPointSizeF( + max(font.pointSize() * 1.2, font.pointSize() + 2)) + titlewidth, titleheight = utils.Renderer( + painter, titlefont, diff --git a/sources b/sources index e4e2d79..1951418 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.2.1.tar.gz) = 38d31415569edb6dacebe3d0f113ad34e62832654835e6066b279168bf07653439e51f2c4ca6eca40f227302982b1c3efef7a2df315d92e93da27e586db8d517 +SHA512 (veusz-3.3.tar.gz) = 98dadf9624fc078e614ec73c0388a885799418072fed4b57a6b0881e90d8066892607cf694f139c19106b2a33c36373bf3f5ad866f2c57acd7a032769d23a63b diff --git a/veusz.spec b/veusz.spec index bb30365..232e870 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,12 +1,13 @@ Name: veusz -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz +Patch0: py10-int.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -42,6 +43,9 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} + +%patch0 -p1 + find -name \*~ | xargs rm -f # remove shebangs from scripts which aren't installed @@ -109,7 +113,7 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{__python3} tests/runselftest.py %files -%doc README AUTHORS COPYING +%doc README.md AUTHORS COPYING %doc examples %doc Documents/manual/html %{_bindir}/* @@ -124,6 +128,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Nov 29 2020 Jeremy Sanders - 3.3-1 +- Update to Veusz 3.3 +- Fix Python 10 compatibility (RHBZ#1903072) + * Wed Jul 29 2020 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 665b226d903723e622482ab124be03ee04eb5427 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sat, 5 Dec 2020 12:03:08 +0100 Subject: [PATCH 16/57] Remove sip requirement from setup.py to fix RHBZ#1904473 --- veusz.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/veusz.spec b/veusz.spec index 232e870..37ab37e 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -8,6 +8,7 @@ License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz Patch0: py10-int.patch +Patch1: drop-sip-install-requires.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -18,7 +19,7 @@ BuildRequires: python3-pyqt5-sip python3-sip-devel sip BuildRequires: python3-h5py python3-astropy BuildRequires: desktop-file-utils -%{?_python3_sip_api:Requires: sip-api(%{_python3_sip_api_major}) >= %{_python3_sip_api}} +%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: python3-numpy python3-qt5 /usr/bin/env Provides: python3-veusz @@ -45,6 +46,7 @@ data. 3D point, surface, volume and function plots are also supported. %setup -q -n veusz-%{version} %patch0 -p1 +%patch1 -p1 find -name \*~ | xargs rm -f @@ -128,6 +130,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Dec 05 2020 Jeremy Sanders - 3.3-2 +- Depend on namespaced sip module +- Drop sip requirement in setup.py (RHBZ#1904473) + * Sun Nov 29 2020 Jeremy Sanders - 3.3-1 - Update to Veusz 3.3 - Fix Python 10 compatibility (RHBZ#1903072) From ad27a18f3f16856e9762aa9f9d15f3ca1d1ac5b3 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sat, 5 Dec 2020 12:15:11 +0100 Subject: [PATCH 17/57] Fix missing patch file --- drop-sip-install-requires.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 drop-sip-install-requires.patch diff --git a/drop-sip-install-requires.patch b/drop-sip-install-requires.patch new file mode 100644 index 0000000..06b6daf --- /dev/null +++ b/drop-sip-install-requires.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index dc72ca51..e9a5463e 100644 +--- a/setup.py ++++ b/setup.py +@@ -37,7 +37,7 @@ try: + from setuptools import setup, Extension + from setuptools.command.install import install as orig_install + +- extraoptions['install_requires'] = ['numpy', 'PyQt5', 'sip'] ++ extraoptions['install_requires'] = ['numpy', 'PyQt5'] + extraoptions['extras_require'] = { + "optional": ['astropy', 'pyemf', 'sampy', 'iminuit', 'h5py'] + } From 5b3abc387111baecfd0f92453300f444b9d9d5fc Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 6 Dec 2020 14:12:38 +0100 Subject: [PATCH 18/57] Update to Veusz-3.3.1 --- .gitignore | 1 + drop-sip-install-requires.patch | 13 ------ py10-int.patch | 74 --------------------------------- sources | 2 +- veusz.spec | 12 +++--- 5 files changed, 7 insertions(+), 95 deletions(-) delete mode 100644 drop-sip-install-requires.patch delete mode 100644 py10-int.patch diff --git a/.gitignore b/.gitignore index d163ba4..a89d894 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ veusz-1.8.tar.gz /veusz-3.2.tar.gz /veusz-3.2.1.tar.gz /veusz-3.3.tar.gz +/veusz-3.3.1.tar.gz diff --git a/drop-sip-install-requires.patch b/drop-sip-install-requires.patch deleted file mode 100644 index 06b6daf..0000000 --- a/drop-sip-install-requires.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index dc72ca51..e9a5463e 100644 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,7 @@ try: - from setuptools import setup, Extension - from setuptools.command.install import install as orig_install - -- extraoptions['install_requires'] = ['numpy', 'PyQt5', 'sip'] -+ extraoptions['install_requires'] = ['numpy', 'PyQt5'] - extraoptions['extras_require'] = { - "optional": ['astropy', 'pyemf', 'sampy', 'iminuit', 'h5py'] - } diff --git a/py10-int.patch b/py10-int.patch deleted file mode 100644 index 3e8442a..0000000 --- a/py10-int.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/tests/comparison/multixy.vsz.selftest b/tests/comparison/multixy.vsz.selftest -index f50a4697..3fdd5d1a 100644 ---- a/tests/comparison/multixy.vsz.selftest -+++ b/tests/comparison/multixy.vsz.selftest -@@ -126,13 +126,13 @@ - - - -- -+ - - - - - --Datasets -+Datasets - - - -diff --git a/veusz/document/painthelper.py b/veusz/document/painthelper.py -index 6a312160..6484c228 100644 ---- a/veusz/document/painthelper.py -+++ b/veusz/document/painthelper.py -@@ -41,8 +41,8 @@ class DrawState(object): - - self.widget = widget - self.record = RecordPaintDevice( -- helper.pagesize[0], helper.pagesize[1], -- helper.dpi[0], helper.dpi[1]) -+ int(helper.pagesize[0]), int(helper.pagesize[1]), -+ int(helper.dpi[0]), int(helper.dpi[1])) - self.bounds = bounds - self.clip = clip - -diff --git a/veusz/setting/collections.py b/veusz/setting/collections.py -index b5da0bf4..d7355126 100644 ---- a/veusz/setting/collections.py -+++ b/veusz/setting/collections.py -@@ -366,7 +366,7 @@ class Text(Settings): - if self.bold: - weight = qt.QFont.Bold - -- f = qt.QFont(self.font, size, weight, self.italic) -+ f = qt.QFont(self.font, int(size), weight, self.italic) - if self.underline: - f.setUnderline(True) - f.setStyleHint(qt.QFont.Times) -diff --git a/veusz/utils/textrender.py b/veusz/utils/textrender.py -index c87c0968..58f597be 100644 ---- a/veusz/utils/textrender.py -+++ b/veusz/utils/textrender.py -@@ -1520,7 +1520,7 @@ class _MmlRenderer(_Renderer): - if ptsize < 0: - ptsize = self.font.pixelSize() / self.painter.pixperpt - -- doc.setBaseFontPointSize(ptsize * upscale) -+ doc.setBaseFontPointSize(int(ptsize * upscale)) - - # the output will be painted finally scaled - self.drawscale = ( -diff --git a/veusz/widgets/key.py b/veusz/widgets/key.py -index 7c7ecfa4..b2073382 100644 ---- a/veusz/widgets/key.py -+++ b/veusz/widgets/key.py -@@ -402,7 +402,7 @@ class Key(widget.Widget): - if s.title != '': - titlefont = qt.QFont(font) - painter.setPen(textpen) -- titlefont.setPointSize( -+ titlefont.setPointSizeF( - max(font.pointSize() * 1.2, font.pointSize() + 2)) - titlewidth, titleheight = utils.Renderer( - painter, titlefont, diff --git a/sources b/sources index 1951418..fda7a91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.3.tar.gz) = 98dadf9624fc078e614ec73c0388a885799418072fed4b57a6b0881e90d8066892607cf694f139c19106b2a33c36373bf3f5ad866f2c57acd7a032769d23a63b +SHA512 (veusz-3.3.1.tar.gz) = a2fa204a33ae0dac98907c3af88b24f322849360e30c05101bbfa6307dc8aa6fdec580f060fc9cd9921f7706db51419efe088f927d22db860419eea4e0f4e84c diff --git a/veusz.spec b/veusz.spec index 37ab37e..1fab008 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,14 +1,12 @@ Name: veusz -Version: 3.3 -Release: 2%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz -Patch0: py10-int.patch -Patch1: drop-sip-install-requires.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -45,9 +43,6 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} -%patch0 -p1 -%patch1 -p1 - find -name \*~ | xargs rm -f # remove shebangs from scripts which aren't installed @@ -130,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Dec 06 2020 Jeremy Sanders - 3.3.1-1 +- Update to Veusz 3.3.1, dropping upstreamed patches + * Sat Dec 05 2020 Jeremy Sanders - 3.3-2 - Depend on namespaced sip module - Drop sip requirement in setup.py (RHBZ#1904473) From eac975919a87151e6e93339ab182beecfb149ef9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:01:26 +0000 Subject: [PATCH 19/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 1fab008..64ba6bd 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -125,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Dec 06 2020 Jeremy Sanders - 3.3.1-1 - Update to Veusz 3.3.1, dropping upstreamed patches From 5615c88c4c4b8f7608f9e3f34254b33a5b0654a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:17 +0200 Subject: [PATCH 20/57] Rebuilt for Python 3.10 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 64ba6bd..c643937 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -125,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Jun 04 2021 Python Maint - 3.3.1-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 3.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c3e1471f7506cc8573aa03cae279afc598a41aa4 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Wed, 16 Jun 2021 19:15:41 +0200 Subject: [PATCH 21/57] Temporarily drop python3-astropy build requirement --- veusz.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/veusz.spec b/veusz.spec index c643937..0f42bca 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -14,7 +14,7 @@ BuildRequires: python3-numpy BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel BuildRequires: python3-pyqt5-sip python3-sip-devel sip -BuildRequires: python3-h5py python3-astropy +BuildRequires: python3-h5py BuildRequires: desktop-file-utils %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} @@ -125,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jun 16 2021 Jeremy Sanders - 3.3.1-4 +- Drop astropy build requirement as python3-astropy not currently building + * Fri Jun 04 2021 Python Maint - 3.3.1-3 - Rebuilt for Python 3.10 From b80213f1fdec38dd5d72817850f91d3622ae3edb Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 16 Jun 2021 23:05:29 -0400 Subject: [PATCH 22/57] Update to build with sip 5 --- veusz.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/veusz.spec b/veusz.spec index 0f42bca..dc69325 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -13,11 +13,11 @@ BuildRequires: python3 python3-devel python3-setuptools BuildRequires: python3-numpy BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel -BuildRequires: python3-pyqt5-sip python3-sip-devel sip +BuildRequires: python3-pyqt5-sip python3dist(sip) BuildRequires: python3-h5py BuildRequires: desktop-file-utils -%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} +Requires: python3dist(pyqt5-sip) >= 12.8, python3dist(pyqt5-sip) < 13 Requires: python3-numpy python3-qt5 /usr/bin/env Provides: python3-veusz @@ -125,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jun 16 2021 Scott Talbert - 3.3.1-5 +- Update to build with sip 5 + * Wed Jun 16 2021 Jeremy Sanders - 3.3.1-4 - Drop astropy build requirement as python3-astropy not currently building From cede521892212f02fec9b3fabf01250ee3b1eeb2 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 15 Jul 2021 16:08:40 -0400 Subject: [PATCH 23/57] Revert back to building with sip 4 due to no sip 6 support --- veusz.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/veusz.spec b/veusz.spec index dc69325..94a32e5 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -13,11 +13,11 @@ BuildRequires: python3 python3-devel python3-setuptools BuildRequires: python3-numpy BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel -BuildRequires: python3-pyqt5-sip python3dist(sip) +BuildRequires: python3-pyqt5-sip python3-sip-devel sip BuildRequires: python3-h5py BuildRequires: desktop-file-utils -Requires: python3dist(pyqt5-sip) >= 12.8, python3dist(pyqt5-sip) < 13 +%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: python3-numpy python3-qt5 /usr/bin/env Provides: python3-veusz @@ -50,8 +50,11 @@ find -name \*~ | xargs rm -f sed -i '/^#!/d' veusz/veusz_main.py sed -i '/^#!/d' veusz/veusz_listen.py +# Temp patch to find .sip files in sip5+ location +sed -i "s/os.path.join(sip_dir, 'PyQt5')/sip_dir/" pyqtdistutils.py + %build -%py3_build +SIP_DIR=%{python3_sitearch}/PyQt5/bindings %py3_build %install rm -rf %{buildroot} @@ -125,6 +128,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jul 10 2021 Scott Talbert - 3.3.1-6 +- Revert back to building with sip 4 due to no sip 6 support + * Wed Jun 16 2021 Scott Talbert - 3.3.1-5 - Update to build with sip 5 From f357b9aecac8f1342cf064f58c3edef332fef41a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:25:20 +0000 Subject: [PATCH 24/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 94a32e5..c78692e 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -128,6 +128,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 10 2021 Scott Talbert - 3.3.1-6 - Revert back to building with sip 4 due to no sip 6 support From 7b6c03596f3d6bd178c9b03d9392c57732bf425d Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 17 Oct 2021 12:51:14 +0200 Subject: [PATCH 25/57] Update to Veusz 3.4. Switch to sip 6. --- .gitignore | 1 + sources | 2 +- veusz.spec | 14 +++++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a89d894..d99d62a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ veusz-1.8.tar.gz /veusz-3.2.1.tar.gz /veusz-3.3.tar.gz /veusz-3.3.1.tar.gz +/veusz-3.4.tar.gz diff --git a/sources b/sources index fda7a91..ef95e29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.3.1.tar.gz) = a2fa204a33ae0dac98907c3af88b24f322849360e30c05101bbfa6307dc8aa6fdec580f060fc9cd9921f7706db51419efe088f927d22db860419eea4e0f4e84c +SHA512 (veusz-3.4.tar.gz) = 2c386c033ea432142ab3f92c0544ff6a184894858cf4570dfa3f3a5cd9b244a802cd39844e8325b8edff8aaef883735d47e46da7a9cbbaf922545055090a009a diff --git a/veusz.spec b/veusz.spec index c78692e..5939628 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz -Version: 3.3.1 -Release: 7%{?dist} +Version: 3.4 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -13,11 +13,11 @@ BuildRequires: python3 python3-devel python3-setuptools BuildRequires: python3-numpy BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel -BuildRequires: python3-pyqt5-sip python3-sip-devel sip +BuildRequires: python3-pyqt5-sip python3dist(sip) BuildRequires: python3-h5py BuildRequires: desktop-file-utils -%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} +Requires: python3dist(pyqt5-sip) >= 12.8, python3dist(pyqt5-sip) < 13 Requires: python3-numpy python3-qt5 /usr/bin/env Provides: python3-veusz @@ -54,7 +54,7 @@ sed -i '/^#!/d' veusz/veusz_listen.py sed -i "s/os.path.join(sip_dir, 'PyQt5')/sip_dir/" pyqtdistutils.py %build -SIP_DIR=%{python3_sitearch}/PyQt5/bindings %py3_build +%py3_build %install rm -rf %{buildroot} @@ -128,6 +128,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Oct 17 2021 Jeremy Sanders - 3.4-1 +- Update to Veusz 3.4 +- Switch to sip 6 + * Fri Jul 23 2021 Fedora Release Engineering - 3.3.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 6e84b11dfdf90420c15703961bfbc18871b7fa5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:55:31 +0000 Subject: [PATCH 26/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 5939628..37937b8 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -128,6 +128,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Oct 17 2021 Jeremy Sanders - 3.4-1 - Update to Veusz 3.4 - Switch to sip 6 From a5accf641d8a684123cf8cc3b90d10c7abc7396b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 14 Jun 2022 19:48:27 +0200 Subject: [PATCH 27/57] Rebuilt for Python 3.11 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 37937b8..33d5956 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -128,6 +128,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue Jun 14 2022 Python Maint - 3.4-3 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bc9252c5d99d56a332e0435e308b092fd8d95ddf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:49:47 +0000 Subject: [PATCH 28/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 33d5956..f982ee3 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python @@ -128,6 +128,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 14 2022 Python Maint - 3.4-3 - Rebuilt for Python 3.11 From 1c83d5e1bc64e4caa6504c6bec324f1142bb942c Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Wed, 17 Aug 2022 21:51:01 +0100 Subject: [PATCH 29/57] Fix build system for new sip versions (RHBZ#2113753) --- sip-build.patch | 178 ++++++++++++++++++++++++++++++++++++++++++++++++ veusz.spec | 7 +- 2 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 sip-build.patch diff --git a/sip-build.patch b/sip-build.patch new file mode 100644 index 0000000..70fe162 --- /dev/null +++ b/sip-build.patch @@ -0,0 +1,178 @@ +diff --git a/pyqtdistutils.py b/pyqtdistutils.py +index 5156108a..f8bd208c 100644 +--- a/pyqtdistutils.py ++++ b/pyqtdistutils.py +@@ -5,18 +5,13 @@ + # Based on Pyrex.Distutils, written by Graham Fawcett and Darrel Gallion. + + import os ++import shutil + import subprocess ++import toml + + from distutils.sysconfig import customize_compiler, get_python_lib + import distutils.command.build_ext + +-import toml +- +-from sipbuild.code_generator import set_globals, parse, generateCode +-from sipbuild.exceptions import UserException +-from sipbuild.module import copy_sip_h, resolve_abi_version +-from sipbuild.version import SIP_VERSION, SIP_VERSION_STR +- + ################################################################## + + def replace_suffix(path, new_suffix): +@@ -30,10 +25,9 @@ def find_on_path(names, mainname): + path = os.getenv('PATH', os.path.defpath) + pathparts = path.split(os.path.pathsep) + for cmd in names: +- for dirname in pathparts: +- cmdtry = os.path.join(dirname.strip('"'), cmd) +- if os.path.isfile(cmdtry) and os.access(cmdtry, os.X_OK): +- return cmdtry ++ resolved = shutil.which(cmd) ++ if resolved: ++ return resolved + raise RuntimeError('Could not find %s executable' % mainname) + + def read_command_output(cmd): +@@ -206,8 +200,8 @@ class build_ext(distutils.command.build_ext.build_ext): + # Collect the names of the source (.sip) files + sip_sources = [] + sip_sources = [source for source in sources if source.endswith('.sip')] +- other_sources = [source for source in sources +- if not source.endswith('.sip')] ++ other_sources = [ ++ source for source in sources if not source.endswith('.sip')] + generated_sources = [] + + for sip in sip_sources: +@@ -216,64 +210,79 @@ class build_ext(distutils.command.build_ext.build_ext): + if not os.path.exists(sip_builddir) or self.force: + os.makedirs(sip_builddir, exist_ok=True) + self._sip_compile(sip, sip_builddir) +- out = [ +- os.path.join(sip_builddir, fn) +- for fn in sorted(os.listdir(sip_builddir)) +- if fn.endswith(".cpp") ++ ++ # files get put in sip_builddir + modulename ++ modulename = os.path.splitext(os.path.basename(sip))[0] ++ dirname = os.path.join(sip_builddir, 'output', modulename) ++ ++ source_files = [ ++ os.path.join(dirname, fn) ++ for fn in sorted(os.listdir(dirname)) ++ if fn.endswith(".cpp") or fn.endswith(".c") + ] +- generated_sources.extend(out) ++ ++ generated_sources.extend(source_files) + + return generated_sources + other_sources + + def _sip_compile(self, source, sip_builddir): + """Compile sip file to sources.""" +- sip_module = 'PyQt5.sip' +- pyqt5_include_dir = os.path.join(get_python_lib(plat_specific=1), +- 'PyQt5', 'bindings') ++ ++ pyqt5_include_dir = os.path.join( ++ get_python_lib(plat_specific=1), 'PyQt5', 'bindings') + pyqt5_toml = os.path.join(pyqt5_include_dir, 'QtCore', 'QtCore.toml') + pyqt5_cfg = toml.load(pyqt5_toml) + abi_version = pyqt5_cfg.get('sip-abi-version') +- abi_major, abi_minor = abi_version.split('.') +- +- # header file location changed to major version in sip-6.2.0 +- if SIP_VERSION >= 0x60200: +- hdr_version = abi_major +- else: +- hdr_version = abi_version +- copy_sip_h(hdr_version, sip_builddir, sip_module) +- +- sip_major_version = SIP_VERSION >> 16 +- common_args = [SIP_VERSION, SIP_VERSION_STR, int(abi_major), int(abi_minor)] +- if sip_major_version >= 6: +- set_globals(*common_args, sip_module, UserException, [pyqt5_include_dir]) +- else: +- set_globals(*common_args, UserException, [pyqt5_include_dir]) +- +- pt, _fq_name, _uses_limited_api, _sip_files, tags, disabled_features = parse( +- source, +- True, # strict mode +- [], # list of additional version/platform tags +- [], # list of timeline backstops +- [], # list of disabled features +- False, # protected is public +- ) + +- generate_args = [ +- pt, +- sip_builddir, +- None, # source files suffix (default .c, .cpp) +- False, # whether to enable support for exceptions +- False, # whether to generate code with tracing enabled +- False, # whether to always release and reacquire the GIL +- 0, # number of files to split the generated code into +- tags, +- disabled_features, +- False, # whether to enable the automatic generation of docstrings +- False, # whether to generate code for a debug build of Python +- ] +- if sip_major_version < 6: +- generate_args.append(sip_module) +- generateCode(*generate_args) ++ modulename = os.path.splitext(os.path.basename(source))[0] ++ srcdir = os.path.abspath(os.path.dirname(source)) ++ ++ # location of sip output files ++ output_dir = os.path.abspath(os.path.join(sip_builddir, 'output')) ++ os.makedirs(output_dir) ++ ++ # generate a pyproject.toml to generate the sip source ++ pyproject_data = { ++ 'build-system': { ++ 'requires': ['sip >=5.5.0, <7'], ++ 'build-backend': 'sipbuild.api', ++ }, ++ 'tool': { ++ 'sip': { ++ 'metadata': { ++ 'name': modulename, ++ }, ++ 'bindings': { ++ modulename: { ++ 'pep484-pyi': False, ++ 'protected-is-public': False ++ } ++ }, ++ 'project': { ++ 'sip-include-dirs': [pyqt5_include_dir], ++ 'abi-version': abi_version, ++ 'build-dir': output_dir, ++ 'sip-module': 'PyQt5.sip', ++ 'sip-files-dir': srcdir, ++ } ++ } ++ } ++ } ++ pyproject_fname = os.path.join(sip_builddir, 'pyproject.toml') ++ with open(pyproject_fname, 'w') as fout: ++ toml.dump(pyproject_data, fout) ++ ++ # generate the source files for the bindings ++ build_cmd = shutil.which('sip-build') ++ if not build_cmd: ++ raise RuntimeError('Could not find sip-build command on PATH') ++ subprocess.check_call([build_cmd, '--no-compile'], cwd=sip_builddir) ++ ++ # put sip header in correct location ++ shutil.copyfile( ++ os.path.join(output_dir, 'sip.h'), ++ os.path.join(output_dir, modulename, 'sip.h') ++ ) + + def build_extensions(self): + # remove annoying flag which causes warning for c++ sources diff --git a/veusz.spec b/veusz.spec index f982ee3..8afcc0d 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,12 +1,13 @@ Name: veusz Version: 3.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz +Patch0: sip-build.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -42,6 +43,7 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} +%patch0 -p1 find -name \*~ | xargs rm -f @@ -128,6 +130,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Aug 17 2022 Jeremy Sanders - 3.4-5 +- Patch to fix build system for new sip versions (RHBZ#2113753) + * Sat Jul 23 2022 Fedora Release Engineering - 3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e100c9730853ae2d4f9f059752410e4e2a4a8f32 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Tue, 1 Nov 2022 11:22:11 +0000 Subject: [PATCH 30/57] Update to Veusz 3.5 --- .gitignore | 1 + sip-build.patch | 178 ------------------------------------------------ sources | 2 +- veusz.spec | 10 +-- 4 files changed, 8 insertions(+), 183 deletions(-) delete mode 100644 sip-build.patch diff --git a/.gitignore b/.gitignore index d99d62a..cef5864 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ veusz-1.8.tar.gz /veusz-3.3.tar.gz /veusz-3.3.1.tar.gz /veusz-3.4.tar.gz +/veusz-3.5.tar.gz diff --git a/sip-build.patch b/sip-build.patch deleted file mode 100644 index 70fe162..0000000 --- a/sip-build.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff --git a/pyqtdistutils.py b/pyqtdistutils.py -index 5156108a..f8bd208c 100644 ---- a/pyqtdistutils.py -+++ b/pyqtdistutils.py -@@ -5,18 +5,13 @@ - # Based on Pyrex.Distutils, written by Graham Fawcett and Darrel Gallion. - - import os -+import shutil - import subprocess -+import toml - - from distutils.sysconfig import customize_compiler, get_python_lib - import distutils.command.build_ext - --import toml -- --from sipbuild.code_generator import set_globals, parse, generateCode --from sipbuild.exceptions import UserException --from sipbuild.module import copy_sip_h, resolve_abi_version --from sipbuild.version import SIP_VERSION, SIP_VERSION_STR -- - ################################################################## - - def replace_suffix(path, new_suffix): -@@ -30,10 +25,9 @@ def find_on_path(names, mainname): - path = os.getenv('PATH', os.path.defpath) - pathparts = path.split(os.path.pathsep) - for cmd in names: -- for dirname in pathparts: -- cmdtry = os.path.join(dirname.strip('"'), cmd) -- if os.path.isfile(cmdtry) and os.access(cmdtry, os.X_OK): -- return cmdtry -+ resolved = shutil.which(cmd) -+ if resolved: -+ return resolved - raise RuntimeError('Could not find %s executable' % mainname) - - def read_command_output(cmd): -@@ -206,8 +200,8 @@ class build_ext(distutils.command.build_ext.build_ext): - # Collect the names of the source (.sip) files - sip_sources = [] - sip_sources = [source for source in sources if source.endswith('.sip')] -- other_sources = [source for source in sources -- if not source.endswith('.sip')] -+ other_sources = [ -+ source for source in sources if not source.endswith('.sip')] - generated_sources = [] - - for sip in sip_sources: -@@ -216,64 +210,79 @@ class build_ext(distutils.command.build_ext.build_ext): - if not os.path.exists(sip_builddir) or self.force: - os.makedirs(sip_builddir, exist_ok=True) - self._sip_compile(sip, sip_builddir) -- out = [ -- os.path.join(sip_builddir, fn) -- for fn in sorted(os.listdir(sip_builddir)) -- if fn.endswith(".cpp") -+ -+ # files get put in sip_builddir + modulename -+ modulename = os.path.splitext(os.path.basename(sip))[0] -+ dirname = os.path.join(sip_builddir, 'output', modulename) -+ -+ source_files = [ -+ os.path.join(dirname, fn) -+ for fn in sorted(os.listdir(dirname)) -+ if fn.endswith(".cpp") or fn.endswith(".c") - ] -- generated_sources.extend(out) -+ -+ generated_sources.extend(source_files) - - return generated_sources + other_sources - - def _sip_compile(self, source, sip_builddir): - """Compile sip file to sources.""" -- sip_module = 'PyQt5.sip' -- pyqt5_include_dir = os.path.join(get_python_lib(plat_specific=1), -- 'PyQt5', 'bindings') -+ -+ pyqt5_include_dir = os.path.join( -+ get_python_lib(plat_specific=1), 'PyQt5', 'bindings') - pyqt5_toml = os.path.join(pyqt5_include_dir, 'QtCore', 'QtCore.toml') - pyqt5_cfg = toml.load(pyqt5_toml) - abi_version = pyqt5_cfg.get('sip-abi-version') -- abi_major, abi_minor = abi_version.split('.') -- -- # header file location changed to major version in sip-6.2.0 -- if SIP_VERSION >= 0x60200: -- hdr_version = abi_major -- else: -- hdr_version = abi_version -- copy_sip_h(hdr_version, sip_builddir, sip_module) -- -- sip_major_version = SIP_VERSION >> 16 -- common_args = [SIP_VERSION, SIP_VERSION_STR, int(abi_major), int(abi_minor)] -- if sip_major_version >= 6: -- set_globals(*common_args, sip_module, UserException, [pyqt5_include_dir]) -- else: -- set_globals(*common_args, UserException, [pyqt5_include_dir]) -- -- pt, _fq_name, _uses_limited_api, _sip_files, tags, disabled_features = parse( -- source, -- True, # strict mode -- [], # list of additional version/platform tags -- [], # list of timeline backstops -- [], # list of disabled features -- False, # protected is public -- ) - -- generate_args = [ -- pt, -- sip_builddir, -- None, # source files suffix (default .c, .cpp) -- False, # whether to enable support for exceptions -- False, # whether to generate code with tracing enabled -- False, # whether to always release and reacquire the GIL -- 0, # number of files to split the generated code into -- tags, -- disabled_features, -- False, # whether to enable the automatic generation of docstrings -- False, # whether to generate code for a debug build of Python -- ] -- if sip_major_version < 6: -- generate_args.append(sip_module) -- generateCode(*generate_args) -+ modulename = os.path.splitext(os.path.basename(source))[0] -+ srcdir = os.path.abspath(os.path.dirname(source)) -+ -+ # location of sip output files -+ output_dir = os.path.abspath(os.path.join(sip_builddir, 'output')) -+ os.makedirs(output_dir) -+ -+ # generate a pyproject.toml to generate the sip source -+ pyproject_data = { -+ 'build-system': { -+ 'requires': ['sip >=5.5.0, <7'], -+ 'build-backend': 'sipbuild.api', -+ }, -+ 'tool': { -+ 'sip': { -+ 'metadata': { -+ 'name': modulename, -+ }, -+ 'bindings': { -+ modulename: { -+ 'pep484-pyi': False, -+ 'protected-is-public': False -+ } -+ }, -+ 'project': { -+ 'sip-include-dirs': [pyqt5_include_dir], -+ 'abi-version': abi_version, -+ 'build-dir': output_dir, -+ 'sip-module': 'PyQt5.sip', -+ 'sip-files-dir': srcdir, -+ } -+ } -+ } -+ } -+ pyproject_fname = os.path.join(sip_builddir, 'pyproject.toml') -+ with open(pyproject_fname, 'w') as fout: -+ toml.dump(pyproject_data, fout) -+ -+ # generate the source files for the bindings -+ build_cmd = shutil.which('sip-build') -+ if not build_cmd: -+ raise RuntimeError('Could not find sip-build command on PATH') -+ subprocess.check_call([build_cmd, '--no-compile'], cwd=sip_builddir) -+ -+ # put sip header in correct location -+ shutil.copyfile( -+ os.path.join(output_dir, 'sip.h'), -+ os.path.join(output_dir, modulename, 'sip.h') -+ ) - - def build_extensions(self): - # remove annoying flag which causes warning for c++ sources diff --git a/sources b/sources index ef95e29..9826fad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.4.tar.gz) = 2c386c033ea432142ab3f92c0544ff6a184894858cf4570dfa3f3a5cd9b244a802cd39844e8325b8edff8aaef883735d47e46da7a9cbbaf922545055090a009a +SHA512 (veusz-3.5.tar.gz) = 67cf1d4905c5113728668419fd0edf724226ae66baab4c843e4f59651527fffe86703af00e88759410e7becb2b2e2350ca88a4bdf8ba7c5dde7984c39ef7abf4 diff --git a/veusz.spec b/veusz.spec index 8afcc0d..a482064 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,13 +1,12 @@ Name: veusz -Version: 3.4 -Release: 5%{?dist} +Version: 3.5 +Release: 1%{?dist} Summary: GUI scientific plotting package # The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python License: GPLv2+ and Python URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz -Patch0: sip-build.patch BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools @@ -16,6 +15,7 @@ BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel BuildRequires: python3-qt5 python3-qt5-devel BuildRequires: python3-pyqt5-sip python3dist(sip) BuildRequires: python3-h5py +BuildRequires: python3-tomli BuildRequires: desktop-file-utils Requires: python3dist(pyqt5-sip) >= 12.8, python3dist(pyqt5-sip) < 13 @@ -43,7 +43,6 @@ data. 3D point, surface, volume and function plots are also supported. %prep %setup -q -n veusz-%{version} -%patch0 -p1 find -name \*~ | xargs rm -f @@ -130,6 +129,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue Nov 01 2022 Jeremy Sanders - 3.5-1 +- Update to Veusz 3.5 + * Wed Aug 17 2022 Jeremy Sanders - 3.4-5 - Patch to fix build system for new sip versions (RHBZ#2113753) From e3d64b38f7d7616294b2b74ab3fa0dc16aa9a2b0 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Tue, 1 Nov 2022 19:01:51 +0000 Subject: [PATCH 31/57] Update to 3.5.2 --- .gitignore | 1 + sources | 2 +- veusz.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cef5864..cccdfa2 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ veusz-1.8.tar.gz /veusz-3.3.1.tar.gz /veusz-3.4.tar.gz /veusz-3.5.tar.gz +/veusz-3.5.2.tar.gz diff --git a/sources b/sources index 9826fad..7b6cee6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.5.tar.gz) = 67cf1d4905c5113728668419fd0edf724226ae66baab4c843e4f59651527fffe86703af00e88759410e7becb2b2e2350ca88a4bdf8ba7c5dde7984c39ef7abf4 +SHA512 (veusz-3.5.2.tar.gz) = 12aa9e062ced85ce2d90da42b1410e99e027272e97675cc40ea42ae4b2e6a129a68eea0d9bd8058804ca67545d500a7f09df9585e45f7fa1f94d696753375ff7 diff --git a/veusz.spec b/veusz.spec index a482064..bacb704 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,5 +1,5 @@ Name: veusz -Version: 3.5 +Version: 3.5.2 Release: 1%{?dist} Summary: GUI scientific plotting package @@ -129,6 +129,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue Nov 01 2022 Jeremy Sanders - 3.5.2-1 +- Update to Veusz 3.5.2 + * Tue Nov 01 2022 Jeremy Sanders - 3.5-1 - Update to Veusz 3.5 From 848727e145510ac0bfb6874a466557517193048c Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Tue, 1 Nov 2022 20:20:18 +0000 Subject: [PATCH 32/57] Update to veusz 3.5.3 --- .gitignore | 1 + sources | 2 +- veusz.spec | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cccdfa2..9a127d6 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ veusz-1.8.tar.gz /veusz-3.4.tar.gz /veusz-3.5.tar.gz /veusz-3.5.2.tar.gz +/veusz-3.5.3.tar.gz diff --git a/sources b/sources index 7b6cee6..c2faff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.5.2.tar.gz) = 12aa9e062ced85ce2d90da42b1410e99e027272e97675cc40ea42ae4b2e6a129a68eea0d9bd8058804ca67545d500a7f09df9585e45f7fa1f94d696753375ff7 +SHA512 (veusz-3.5.3.tar.gz) = 26c245640b83a3e6d0d036e942774b15d47dcb4dd2af41025528781f63ecb2ba5357b3eeedcb7a3432bd2b54cce7bca0587f47b6f1208d08532f3a08cab19d32 diff --git a/veusz.spec b/veusz.spec index bacb704..b9d1869 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,5 +1,5 @@ Name: veusz -Version: 3.5.2 +Version: 3.5.3 Release: 1%{?dist} Summary: GUI scientific plotting package @@ -129,8 +129,8 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog -* Tue Nov 01 2022 Jeremy Sanders - 3.5.2-1 -- Update to Veusz 3.5.2 +* Tue Nov 01 2022 Jeremy Sanders - 3.5.3-1 +- Update to Veusz 3.5.3 * Tue Nov 01 2022 Jeremy Sanders - 3.5-1 - Update to Veusz 3.5 From d7bab34881168d106186f6d74be368bab1cc1077 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Tue, 17 Jan 2023 18:12:14 +0000 Subject: [PATCH 33/57] spec file improvements * Use explicit files, rather than glob all * Update licence to new rules * Update provide filtering to new method for internal libraries --- veusz.spec | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/veusz.spec b/veusz.spec index b9d1869..e243c3a 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,10 +1,9 @@ Name: veusz Version: 3.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package -# The entire source code is GPLv2+ except helpers/src/_nc_cntr.c which is Python -License: GPLv2+ and Python +License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz @@ -24,10 +23,7 @@ Provides: python3-veusz # we don't want to provide private python extension libs # https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering -%{?filter_setup: -%filter_provides_in %{python3_sitearch}/veusz/helpers/.*\.so$ -%filter_setup -} +%global __provides_exclude_from ^%{python3_sitearch}/veusz/helpers/.*\\.so$ # install docs in version specific for old releases %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -117,18 +113,23 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %doc README.md AUTHORS COPYING %doc examples %doc Documents/manual/html -%{_bindir}/* -%{_mandir}/man1/* -%{_datadir}/applications/* -%{_datadir}/mime/packages/* -%{_datadir}/appdata/* -%{_datadir}/pixmaps/* -%{_datadir}/icons/hicolor/*/apps/* +%{_bindir}/veusz +%{_mandir}/man1/veusz.1.gz +%{_datadir}/applications/veusz.desktop +%{_datadir}/mime/packages/veusz.xml +%{_datadir}/appdata/veusz.appdata.xml +%{_datadir}/pixmaps/veusz.png +%{_datadir}/icons/hicolor/*/apps/veusz.* %{_datadir}/veusz %{python3_sitearch}/veusz-*.egg-info %{python3_sitearch}/veusz %changelog +* Mon Jan 16 2023 Jeremy Sanders - 3.5.3-2 +- Use explicit files, rather than glob all +- Update licence to new rules +- Update provide filtering to new method for internal libraries + * Tue Nov 01 2022 Jeremy Sanders - 3.5.3-1 - Update to Veusz 3.5.3 From a58fa1712c35eceb041b633436a978ee297052c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:14:58 +0000 Subject: [PATCH 34/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index e243c3a..2e7b7ba 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -125,6 +125,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Jeremy Sanders - 3.5.3-2 - Use explicit files, rather than glob all - Update licence to new rules From 4376fa873bc728643827006f24f0182d670fb0b0 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sat, 25 Feb 2023 19:36:46 +0000 Subject: [PATCH 35/57] Update to Veusz 3.6 --- .gitignore | 1 + sources | 2 +- veusz.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9a127d6..4298d72 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ veusz-1.8.tar.gz /veusz-3.5.tar.gz /veusz-3.5.2.tar.gz /veusz-3.5.3.tar.gz +/veusz-3.6.tar.gz diff --git a/sources b/sources index c2faff3..23d266c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.5.3.tar.gz) = 26c245640b83a3e6d0d036e942774b15d47dcb4dd2af41025528781f63ecb2ba5357b3eeedcb7a3432bd2b54cce7bca0587f47b6f1208d08532f3a08cab19d32 +SHA512 (veusz-3.6.tar.gz) = 61209ea351c5e30c6f939de8c3794f4fcfc180be7dbd480e3759e486e6983275f0daddf38ebdda6c292325908c42c7b6851ab1718d7cc49d93997136f51ee67a diff --git a/veusz.spec b/veusz.spec index 2e7b7ba..664d1c1 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz -Version: 3.5.3 -Release: 3%{?dist} +Version: 3.6 +Release: 1%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -47,9 +47,6 @@ find -name \*~ | xargs rm -f sed -i '/^#!/d' veusz/veusz_main.py sed -i '/^#!/d' veusz/veusz_listen.py -# Temp patch to find .sip files in sip5+ location -sed -i "s/os.path.join(sip_dir, 'PyQt5')/sip_dir/" pyqtdistutils.py - %build %py3_build @@ -125,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Feb 25 2023 Jeremy Sanders - 3.6-1 +- Update to Veusz 3.6 + * Sat Jan 21 2023 Fedora Release Engineering - 3.5.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From aa3231eb23efadb1a527541d833a6e1621939b29 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 26 Feb 2023 09:31:49 +0000 Subject: [PATCH 36/57] Update to Veusz 3.6.1 --- .gitignore | 1 + sources | 2 +- veusz.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4298d72..713370b 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ veusz-1.8.tar.gz /veusz-3.5.2.tar.gz /veusz-3.5.3.tar.gz /veusz-3.6.tar.gz +/veusz-3.6.1.tar.gz diff --git a/sources b/sources index 23d266c..95fb991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.6.tar.gz) = 61209ea351c5e30c6f939de8c3794f4fcfc180be7dbd480e3759e486e6983275f0daddf38ebdda6c292325908c42c7b6851ab1718d7cc49d93997136f51ee67a +SHA512 (veusz-3.6.1.tar.gz) = 6db79f8276edd6cf74308fb696f8705a66e73a8f69559e74fa5820213410f15ba06337884418cac02c636cd4217bd07a1125b9192e422684e811f9a9982b5409 diff --git a/veusz.spec b/veusz.spec index 664d1c1..28ab60b 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,5 +1,5 @@ Name: veusz -Version: 3.6 +Version: 3.6.1 Release: 1%{?dist} Summary: GUI scientific plotting package @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Feb 26 2023 Jeremy Sanders - 3.6.1-1 +- Update to Veusz 3.6.1 (fixes appdata issue) + * Sat Feb 25 2023 Jeremy Sanders - 3.6-1 - Update to Veusz 3.6 From 5f7ee137744a9fa5836845c26629784ce1bae023 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 26 Feb 2023 16:04:11 +0000 Subject: [PATCH 37/57] Update to Veusz 3.6.2. Fix resource issue. --- .gitignore | 1 + sources | 2 +- veusz.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 713370b..6beb0ae 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ veusz-1.8.tar.gz /veusz-3.5.3.tar.gz /veusz-3.6.tar.gz /veusz-3.6.1.tar.gz +/veusz-3.6.2.tar.gz diff --git a/sources b/sources index 95fb991..cb0b28a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.6.1.tar.gz) = 6db79f8276edd6cf74308fb696f8705a66e73a8f69559e74fa5820213410f15ba06337884418cac02c636cd4217bd07a1125b9192e422684e811f9a9982b5409 +SHA512 (veusz-3.6.2.tar.gz) = 5580171c0259415cf3de11322133fde02e244b65ffede1e83b5e6d17c8a037624860550495dc0b53c7b5e2f65b3ae6b95daa0e95f7164358e1201ffedeb13f51 diff --git a/veusz.spec b/veusz.spec index 28ab60b..5210453 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,5 +1,5 @@ Name: veusz -Version: 3.6.1 +Version: 3.6.2 Release: 1%{?dist} Summary: GUI scientific plotting package @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Feb 26 2023 Jeremy Sanders - 3.6.2-1 +- Update to Veusz 3.6.2 (fixes resource issue) + * Sun Feb 26 2023 Jeremy Sanders - 3.6.1-1 - Update to Veusz 3.6.1 (fixes appdata issue) From 86047bbb21b114d038f8cd4404572e2d313ece0b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 12 Jul 2023 09:27:56 +0200 Subject: [PATCH 38/57] Rebuilt for Python 3.12 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 5210453..b46178d 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jul 12 2023 Python Maint - 3.6.2-2 +- Rebuilt for Python 3.12 + * Sun Feb 26 2023 Jeremy Sanders - 3.6.2-1 - Update to Veusz 3.6.2 (fixes resource issue) From ae628a8f2ebe2651757e0f8af94e74cb75182a2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:35:14 +0000 Subject: [PATCH 39/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index b46178d..b630095 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jul 12 2023 Python Maint - 3.6.2-2 - Rebuilt for Python 3.12 From 51f3f4d4b3d39946f398eea173dc4682aea0e864 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:41:07 +0000 Subject: [PATCH 40/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index b630095..15dcf20 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4774cb73b8409c181ef95fc3908517867a448232 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 14:02:17 +0200 Subject: [PATCH 41/57] Rebuilt for Python 3.13 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 15dcf20..fa4dca0 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jun 08 2024 Python Maint - 3.6.2-5 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 3.6.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2d87f062214f51b007c2ea0986d397e30b0960c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:43:59 +0000 Subject: [PATCH 42/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index fa4dca0..64a9900 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 3.6.2-5 - Rebuilt for Python 3.13 From 1a7f17776057d842eef85d0e7aac6b9cf9be37e9 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Tue, 24 Dec 2024 12:28:13 +0000 Subject: [PATCH 43/57] Bump build for RHBZ#2333963 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 64a9900..9afddd3 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue Dec 24 2024 Jeremy Sanders - 3.6.2-7 +- Bump for Numpy 2 (RHBZ#2333963) + * Sat Jul 20 2024 Fedora Release Engineering - 3.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 105c3dac1e904ee8fe45b7526947b65f5fcba099 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:17:42 +0000 Subject: [PATCH 44/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 9afddd3..31d78ef 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.6.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 24 2024 Jeremy Sanders - 3.6.2-7 - Bump for Numpy 2 (RHBZ#2333963) From 3a50f7820bbd87b5982098533ee45762fbea7d8b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:53:10 +0200 Subject: [PATCH 45/57] Rebuilt for Python 3.14 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 31d78ef..5a7232e 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 3.6.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -122,6 +122,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Tue Jun 03 2025 Python Maint - 3.6.2-9 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 3.6.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 15b8f85cf4bc9554d26848569af57b317268f2f1 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 15 Jun 2025 10:05:21 +0100 Subject: [PATCH 46/57] Update to Veusz 4.1 --- .gitignore | 1 + sources | 2 +- veusz.spec | 29 +++++++++++++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6beb0ae..419c7af 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ veusz-1.8.tar.gz /veusz-3.6.tar.gz /veusz-3.6.1.tar.gz /veusz-3.6.2.tar.gz +/veusz-4.1.tar.gz diff --git a/sources b/sources index cb0b28a..e4cc620 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-3.6.2.tar.gz) = 5580171c0259415cf3de11322133fde02e244b65ffede1e83b5e6d17c8a037624860550495dc0b53c7b5e2f65b3ae6b95daa0e95f7164358e1201ffedeb13f51 +SHA512 (veusz-4.1.tar.gz) = 02e73aaa1888cad63b88fef8fd8f52a92c4cda90e253d7f628b29190b41e1672c89e5989ec3f282c3f58cc420402d4dcdf514b782e6e663a4a5b18a4a67ee308 diff --git a/veusz.spec b/veusz.spec index 5a7232e..32026d1 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz -Version: 3.6.2 -Release: 9%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -10,15 +10,20 @@ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version BuildRequires: gcc gcc-c++ BuildRequires: python3 python3-devel python3-setuptools BuildRequires: python3-numpy -BuildRequires: qt5-qtbase-devel qt5-qtsvg-devel -BuildRequires: python3-qt5 python3-qt5-devel -BuildRequires: python3-pyqt5-sip python3dist(sip) -BuildRequires: python3-h5py +BuildRequires: qt6-qtbase-devel qt6-qtsvg-devel +BuildRequires: python3-pyqt6 python3-pyqt6-devel +BuildRequires: python3-pyqt6-sip python3dist(sip) +BuildRequires: python3-h5py python3-astropy BuildRequires: python3-tomli BuildRequires: desktop-file-utils -Requires: python3dist(pyqt5-sip) >= 12.8, python3dist(pyqt5-sip) < 13 -Requires: python3-numpy python3-qt5 /usr/bin/env +Requires: python3dist(pyqt6-sip) >= 13, python3dist(pyqt6-sip) < 14 +Requires: python3-pyqt6 python3-pyqt6-sip +Requires: python3-numpy +Requires: qt6-qtsvg +Requires: /usr/bin/env +Recommends: python3-h5py python3-astropy ghostscript qt6-qtimageformats + Provides: python3-veusz # we don't want to provide private python extension libs @@ -54,7 +59,7 @@ sed -i '/^#!/d' veusz/veusz_listen.py rm -rf %{buildroot} # veusz-resource-dir: put data files in location given -%{__python3} setup.py install --skip-build --root %{buildroot} \ +%{python3} setup.py install --skip-build --root %{buildroot} \ --veusz-resource-dir=%{buildroot}/%{_datadir}/veusz \ --disable-install-examples @@ -104,7 +109,7 @@ install -p Documents/man-page/veusz.1 -m 0644 \ PYTHONPATH=%{buildroot}%{python3_sitearch} \ VEUSZ_RESOURCE_DIR=%{buildroot}%{_datadir}/veusz \ QT_QPA_PLATFORM=minimal \ - %{__python3} tests/runselftest.py + %{python3} tests/runselftest.py %files %doc README.md AUTHORS COPYING @@ -122,6 +127,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Jun 15 2025 Jeremy Sanders - 4.1-1 +- Update to Veusz 4.1 +- Updates to Requires and Recommends + * Tue Jun 03 2025 Python Maint - 3.6.2-9 - Rebuilt for Python 3.14 From 0f413f059382b5d79117586cbae1244fd4992833 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 15 Jun 2025 11:41:13 +0100 Subject: [PATCH 47/57] i686 doesn't have python3-astropy, so remove as builddepend --- veusz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 32026d1..49fe572 100644 --- a/veusz.spec +++ b/veusz.spec @@ -13,7 +13,7 @@ BuildRequires: python3-numpy BuildRequires: qt6-qtbase-devel qt6-qtsvg-devel BuildRequires: python3-pyqt6 python3-pyqt6-devel BuildRequires: python3-pyqt6-sip python3dist(sip) -BuildRequires: python3-h5py python3-astropy +BuildRequires: python3-h5py BuildRequires: python3-tomli BuildRequires: desktop-file-utils From 1b52de2cc43ec7634dba3dbb75be0f682f864d74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:03:48 +0000 Subject: [PATCH 48/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 49fe572..e4adfbe 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -127,6 +127,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jun 15 2025 Jeremy Sanders - 4.1-1 - Update to Veusz 4.1 - Updates to Requires and Recommends From f0dd56bb02234bda8fa14694fa96cdc2b2e861a0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:56 +0200 Subject: [PATCH 49/57] Rebuilt for Python 3.14.0rc2 bytecode --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index e4adfbe..2592be8 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -127,6 +127,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Aug 15 2025 Python Maint - 4.1-3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f9d158148d53396aded7d24c931a4f2709e92399 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:02:05 +0200 Subject: [PATCH 50/57] Rebuilt for Python 3.14.0rc3 bytecode --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 2592be8..c0fb12c 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -127,6 +127,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Sep 19 2025 Python Maint - 4.1-4 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 4.1-3 - Rebuilt for Python 3.14.0rc2 bytecode From 5c8b1ae3f05234541641d1292fe3751c6a3f97cf Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 12 Oct 2025 09:54:01 +0100 Subject: [PATCH 51/57] Update to Veusz 4.2 --- .gitignore | 1 + sources | 2 +- veusz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 419c7af..d2e83ed 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ veusz-1.8.tar.gz /veusz-3.6.1.tar.gz /veusz-3.6.2.tar.gz /veusz-4.1.tar.gz +/veusz-4.2.tar.gz diff --git a/sources b/sources index e4cc620..0393faa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (veusz-4.1.tar.gz) = 02e73aaa1888cad63b88fef8fd8f52a92c4cda90e253d7f628b29190b41e1672c89e5989ec3f282c3f58cc420402d4dcdf514b782e6e663a4a5b18a4a67ee308 +SHA512 (veusz-4.2.tar.gz) = e357fffa3c57932bd8f81533d31be5668bed32af6830dd5a517196160f12cd735b66608118bcc166c7c558516ee055fd3194a55d8d5b3369f65a105304a13bb3 diff --git a/veusz.spec b/veusz.spec index c0fb12c..bdb0e21 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz -Version: 4.1 -Release: 4%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -127,6 +127,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Oct 12 2025 Jeremy Sanders - 4.2-1 +- Update to Veusz 4.2 + * Fri Sep 19 2025 Python Maint - 4.1-4 - Rebuilt for Python 3.14.0rc3 bytecode From e08602245d5f0549f7e3f7e316a35e19aaa4b3f6 Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 12 Oct 2025 11:36:12 +0100 Subject: [PATCH 52/57] Remove python-tomli requirement --- veusz.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/veusz.spec b/veusz.spec index bdb0e21..6e31886 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -14,7 +14,6 @@ BuildRequires: qt6-qtbase-devel qt6-qtsvg-devel BuildRequires: python3-pyqt6 python3-pyqt6-devel BuildRequires: python3-pyqt6-sip python3dist(sip) BuildRequires: python3-h5py -BuildRequires: python3-tomli BuildRequires: desktop-file-utils Requires: python3dist(pyqt6-sip) >= 13, python3dist(pyqt6-sip) < 14 @@ -127,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sun Oct 12 2025 Jeremy Sanders - 4.2-2 +- Remove python3-tomli build requirement + * Sun Oct 12 2025 Jeremy Sanders - 4.2-1 - Update to Veusz 4.2 From ee9f2ab2b3d6f05044a8d0ffc406d9ebdb4abaac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:53:05 +0000 Subject: [PATCH 53/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 6e31886..f443e6b 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -126,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sun Oct 12 2025 Jeremy Sanders - 4.2-2 - Remove python3-tomli build requirement From 6602dc159b4aa98cd283215f3c457254c1ec655a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:19 +0200 Subject: [PATCH 54/57] Rebuilt for Python 3.15 --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index f443e6b..457dc74 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -126,6 +126,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Thu Jun 04 2026 Python Maint - 4.2-4 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3ef2556c08555f44338d9a4373a2d1bb895bb68d Mon Sep 17 00:00:00 2001 From: Jeremy Sanders Date: Sun, 21 Jun 2026 17:11:16 +0100 Subject: [PATCH 55/57] Update to Veusz 4.2.1 --- .gitignore | 2 ++ sources | 3 +- veusz.spec | 85 ++++++++++++++++++++++++++---------------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index d2e83ed..ea31816 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ veusz-1.8.tar.gz /veusz-3.6.2.tar.gz /veusz-4.1.tar.gz /veusz-4.2.tar.gz +/veusz-4.2.1.tar.gz +/remove-vectorfield-test.patch diff --git a/sources b/sources index 0393faa..b89f9c1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (veusz-4.2.tar.gz) = e357fffa3c57932bd8f81533d31be5668bed32af6830dd5a517196160f12cd735b66608118bcc166c7c558516ee055fd3194a55d8d5b3369f65a105304a13bb3 +SHA512 (veusz-4.2.1.tar.gz) = 7433f5f7d17f0b45b2a2e3e9d85aa19dcbbdb583f75697ba0919592c99fa9cfd859f94996548b43f7ac3e9e479453041a790d4e3022bb8e699b0e421002e1d58 +SHA512 (remove-vectorfield-test.patch) = b1a05e8a50ead8ea52fec3bdcaffbf731a12ce56a66f7f7256f65ecd75126ccd27ee8f23241a6ffb6c67d62dd9eee034e1b548609448f81165be7ff2dcaf95a9 diff --git a/veusz.spec b/veusz.spec index 457dc74..806257c 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,26 +1,29 @@ Name: veusz -Version: 4.2 -Release: 4%{?dist} +Version: 4.2.1 +Release: 1%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 URL: https://veusz.github.io/ Source0: https://github.com/veusz/veusz/releases/download/veusz-%{version}/veusz-%{version}.tar.gz +Patch0: remove-vectorfield-test.patch + +# see RHBZ#2491178 +ExcludeArch: s390x BuildRequires: gcc gcc-c++ -BuildRequires: python3 python3-devel python3-setuptools +BuildRequires: python3-devel BuildRequires: python3-numpy BuildRequires: qt6-qtbase-devel qt6-qtsvg-devel BuildRequires: python3-pyqt6 python3-pyqt6-devel -BuildRequires: python3-pyqt6-sip python3dist(sip) +BuildRequires: python3dist(sip) BuildRequires: python3-h5py BuildRequires: desktop-file-utils Requires: python3dist(pyqt6-sip) >= 13, python3dist(pyqt6-sip) < 14 -Requires: python3-pyqt6 python3-pyqt6-sip +Requires: python3-pyqt6 Requires: python3-numpy Requires: qt6-qtsvg -Requires: /usr/bin/env Recommends: python3-h5py python3-astropy ghostscript qt6-qtimageformats Provides: python3-veusz @@ -29,8 +32,8 @@ Provides: python3-veusz # https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering %global __provides_exclude_from ^%{python3_sitearch}/veusz/helpers/.*\\.so$ -# install docs in version specific for old releases -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%generate_buildrequires +%pyproject_buildrequires %description Veusz is a 2D and 3D scientific plotting package, designed to create @@ -42,33 +45,24 @@ ternary plots, vector plots, contours, images, shapes and fitting data. 3D point, surface, volume and function plots are also supported. %prep -%setup -q -n veusz-%{version} - -find -name \*~ | xargs rm -f +%autosetup -v -n veusz-%{version} -p1 # remove shebangs from scripts which aren't installed # (veusz allows these to be executed if app isn't installed properly) sed -i '/^#!/d' veusz/veusz_main.py sed -i '/^#!/d' veusz/veusz_listen.py +# delete hidden file in docs +rm -f Documents/manual/html/.buildinfo + %build -%py3_build +%pyproject_wheel %install rm -rf %{buildroot} -# veusz-resource-dir: put data files in location given -%{python3} setup.py install --skip-build --root %{buildroot} \ - --veusz-resource-dir=%{buildroot}/%{_datadir}/veusz \ - --disable-install-examples - -# tell veusz where its resource directory is in _datadir -ln -s %{_datadir}/veusz \ - %{buildroot}%{python3_sitearch}/veusz/resources - -# tell it where to look for examples and COPYING -ln -s %{_pkgdocdir}/examples \ - %{buildroot}%{_datadir}/veusz +%pyproject_install +%pyproject_save_files veusz # install desktop file desktop-file-install \ @@ -80,22 +74,20 @@ mkdir -p %{buildroot}%{_datadir}/mime/packages/ install -p support/veusz.xml -m 0644 %{buildroot}%{_datadir}/mime/packages/ # appdata file -mkdir -p %{buildroot}%{_datadir}/appdata/ -install -p support/veusz.appdata.xml -m 0644 %{buildroot}%{_datadir}/appdata/ +install -D -p -m 0644 support/veusz.appdata.xml \ + %{buildroot}%{_metainfodir}/veusz.appdata.xml -# symlink main veusz icon into pixmaps (for desktop file) -mkdir %{buildroot}%{_datadir}/pixmaps -ln -s ../veusz/icons/veusz_48.png %{buildroot}%{_datadir}/pixmaps/veusz.png +# copy main icon into pixmaps (for desktop file) +install -D -p -m 0644 icons/veusz.png \ + %{buildroot}%{_datadir}/pixmaps/veusz.png -# also link in hicolor icons +# also copy in hicolor icons for size in 16 32 48 64 128; do - odir=%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps - mkdir -p $odir - ln -s %{_datadir}/veusz/icons/veusz_${size}.png ${odir}/veusz.png + install -D -p -m 0644 icons/veusz_${size}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/veusz.png done -odir=%{buildroot}%{_datadir}/icons/hicolor/scalable/apps -mkdir -p $odir -ln -s %{_datadir}/veusz/icons/veusz.svg $odir +install -D -p -m 0644 icons/veusz.svg \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/veusz.svg # install man pages mkdir -p %{buildroot}%{_mandir}/man1 @@ -103,29 +95,35 @@ install -p Documents/man-page/veusz.1 -m 0644 \ %{buildroot}%{_mandir}/man1 %check -# as the data directory hasn't got the same absolute path we have -# to define VEUSZ_RESOURCE_DIR +# emf_export relies on pyemf3 which isn't packaged +%pyproject_check_import -e veusz.document.emf_export -e veusz.examples.* PYTHONPATH=%{buildroot}%{python3_sitearch} \ - VEUSZ_RESOURCE_DIR=%{buildroot}%{_datadir}/veusz \ QT_QPA_PLATFORM=minimal \ %{python3} tests/runselftest.py %files %doc README.md AUTHORS COPYING -%doc examples %doc Documents/manual/html %{_bindir}/veusz %{_mandir}/man1/veusz.1.gz %{_datadir}/applications/veusz.desktop %{_datadir}/mime/packages/veusz.xml -%{_datadir}/appdata/veusz.appdata.xml +%{_metainfodir}/veusz.appdata.xml %{_datadir}/pixmaps/veusz.png %{_datadir}/icons/hicolor/*/apps/veusz.* -%{_datadir}/veusz -%{python3_sitearch}/veusz-*.egg-info +%{python3_sitearch}/veusz-%{version}.dist-info/ %{python3_sitearch}/veusz %changelog +* Sun Jun 21 2026 Jeremy Sanders - 4.2.1-1 +- Update to new Python packaging guidelines +- Update appdata location to _metainfodir +- Copy icons rather than symlink +- Remove line for versioned docdir +- Remove examples from documentation +- Cleanup dependencies and build dependencies +- Update to Veusz 4.2.1 + * Thu Jun 04 2026 Python Maint - 4.2-4 - Rebuilt for Python 3.15 @@ -620,4 +618,3 @@ with Python licensing * Mon Jun 19 2006 Jeremy Sanders - 0.10-2 - Renamed from python-veusz to veusz - From b4caa53a0df7028eba4410562982f5b597114703 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:27:45 +0000 Subject: [PATCH 56/57] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 806257c..8a67043 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -115,6 +115,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sun Jun 21 2026 Jeremy Sanders - 4.2.1-1 - Update to new Python packaging guidelines - Update appdata location to _metainfodir From ffc0c38337458ecff7c7247f24203bf041a4f89c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 20:19:54 +0200 Subject: [PATCH 57/57] Rebuilt for Python 3.15.0b4 ABI change --- veusz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/veusz.spec b/veusz.spec index 8a67043..1e81907 100644 --- a/veusz.spec +++ b/veusz.spec @@ -1,6 +1,6 @@ Name: veusz Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI scientific plotting package License: GPL-2.0-or-later AND (LGPL-2.1-only OR GPL-3.0-only) AND PSF-2.0 AND CC0-1.0 @@ -115,6 +115,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ %{python3_sitearch}/veusz %changelog +* Wed Jul 22 2026 Python Maint - 4.2.1-3 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild