Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scidavis for openSUSE:Factory
checked in at 2021-02-26 22:02:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scidavis (Old)
and /work/SRC/openSUSE:Factory/.scidavis.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scidavis"
Fri Feb 26 22:02:22 2021 rev:6 rq:875453 version:2.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes 2020-12-18
20:00:06.138108257 +0100
+++ /work/SRC/openSUSE:Factory/.scidavis.new.2378/scidavis.changes
2021-02-26 22:02:34.047985019 +0100
@@ -1,0 +2,6 @@
+Tue Feb 23 11:03:17 UTC 2021 - Antonio Larrosa <alarr...@suse.com>
+
+- Add patch to set the sip directory to the one used in SLE/Leap
+ * 0001-Adapt-scidavis-for-Leap.patch
+
+-------------------------------------------------------------------
New:
----
0001-Adapt-scidavis-for-Leap.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scidavis.spec ++++++
--- /var/tmp/diff_new_pack.vASPNE/_old 2021-02-26 22:02:34.611985515 +0100
+++ /var/tmp/diff_new_pack.vASPNE/_new 2021-02-26 22:02:34.611985515 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scidavis
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2012 Quentin Denis <quen...@links2linux.de>
#
# All modifications and additions to the file contributed by third parties
@@ -29,14 +29,18 @@
Source1: scidavis-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch0: 0001-Adapt-scidavis-for-openSUSE.patch
+# PATCH-FIX-OPENSUSE
+Patch1: 0001-Adapt-scidavis-for-Leap.patch
BuildRequires: glu-devel
BuildRequires: hicolor-icon-theme
BuildRequires: liborigin-devel
BuildRequires: pkgconfig
BuildRequires: python3-devel
BuildRequires: python3-qt5-devel
+%if 0%{?suse_version} >= 1550
BuildRequires: python3-sip4
BuildRequires: python3-sip4-devel
+%endif
BuildRequires: qwt-devel
BuildRequires: qwtplot3d-devel
BuildRequires: zlib-devel
@@ -63,6 +67,9 @@
%prep
%setup -q
%patch0 -p1
+%if 0%{?suse_version} < 1550
+%patch1 -p1
+%endif
%build
export PYTHON=python3
++++++ 0001-Adapt-scidavis-for-Leap.patch ++++++
Index: scidavis-2.3.0/libscidavis/python-sipcmd.py
===================================================================
--- scidavis-2.3.0.orig/libscidavis/python-sipcmd.py
+++ scidavis-2.3.0/libscidavis/python-sipcmd.py
@@ -45,7 +45,7 @@ except ImportError:
pass
sipBin = '/usr/bin/sip'
-sipDir = '/usr/lib64/python3.8/site-packages/PyQt5/bindings/'
+sipDir = '/usr/share/sip/PyQt5/'
if not os.path.exists(sipDir):
if sys.version_info[0] >= 3 and sys.version_info[1] >= 8 and pyqt ==
'PyQt5':
from importlib.metadata import distribution
