commit scidavis for openSUSE:Factory

2020-01-31 Thread root 
Hello community,

here is the log from the commit of package scidavis for openSUSE:Factory 
checked in at 2020-01-31 23:55:11

Comparing /work/SRC/openSUSE:Factory/scidavis (Old)
 and  /work/SRC/openSUSE:Factory/.scidavis.new.26092 (New)


Package is "scidavis"

Fri Jan 31 23:55:11 2020 rev:4 rq:768416 version:1.25

Changes:

--- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes2019-06-19 
20:55:49.653848912 +0200
+++ /work/SRC/openSUSE:Factory/.scidavis.new.26092/scidavis.changes 
2020-01-31 23:56:04.575613814 +0100
@@ -1,0 +2,7 @@
+Tue Jan 28 21:55:24 UTC 2020 - Stefan Brüns 
+
+- Use python3 Qt5 bindings instead of python2.
+- Actually build with liborigin support.
+- Remove deprecated mimelnk.
+
+---



Other differences:
--
++ scidavis.spec ++
--- /var/tmp/diff_new_pack.w3hXjg/_old  2020-01-31 23:56:07.575615369 +0100
+++ /var/tmp/diff_new_pack.w3hXjg/_new  2020-01-31 23:56:07.579615371 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package scidavis
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2012 Quentin Denis 
 #
 # All modifications and additions to the file contributed by third parties
@@ -31,7 +31,7 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  liborigin-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python2-qt5-devel
+BuildRequires:  python3-qt5-devel
 BuildRequires:  qwt-devel
 BuildRequires:  qwtplot3d-devel
 BuildRequires:  zlib-devel
@@ -43,9 +43,7 @@
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  pkgconfig(gsl)
 BuildRequires:  pkgconfig(muparser)
-%if 0%{?suse_version} > 1220
 BuildRequires:  glu-devel
-%endif
 Recommends: %{name}-lang = %{version}
 
 %description
@@ -63,7 +61,9 @@
 %patch0 -p1
 
 %build
-%qmake5 CONFIG+=python\
+export PYTHON=python3
+%qmake5 CONFIG+=python \
+  CONFIG+=liborigin \
 %if "%{_lib}" == "lib64"
   64BITS=1
 %endif
@@ -81,6 +81,9 @@
 # Remove unneeded files.
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
+# mimelnk is deprecated in favor of %{_datadir}/mime/packages/ for a long time
+rm -Rf %{buildroot}%{_datadir}/mimelnk
+
 %files lang -f %{name}.lang
 %dir %{_datadir}/scidavis
 %dir %{_datadir}/scidavis/translations
@@ -95,14 +98,11 @@
 %dir %{_datadir}/icons/locolor/22x22/apps
 %dir %{_datadir}/icons/locolor/32x32
 %dir %{_datadir}/icons/locolor/32x32/apps
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application/
 %{_bindir}/%{name}
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*/*/apps/%{name}.*
 %{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mimelnk/application/x-sciprj.desktop
 %{_datadir}/%{name}/
 %exclude %{_datadir}/%{name}/translations
 %{_libdir}/%{name}/

++ scidavis-rpmlintrc ++
--- /var/tmp/diff_new_pack.w3hXjg/_old  2020-01-31 23:56:07.607615385 +0100
+++ /var/tmp/diff_new_pack.w3hXjg/_new  2020-01-31 23:56:07.611615387 +0100
@@ -1,5 +1,3 @@
-# this desktop file is just for mime
-addFilter("untranslated-desktop-file.*x-sciprj.desktop");
 # IMHO needed and not a devel file
 
addFilter("devel-file-in-non-devel-package.*/usr/lib64/scidavis/plugins/lib.*so");
 
addFilter("devel-file-in-non-devel-package.*/usr/lib/scidavis/plugins/lib.*so");

commit scidavis for openSUSE:Factory

2019-06-19 Thread root 
Hello community,

here is the log from the commit of package scidavis for openSUSE:Factory 
checked in at 2019-06-19 20:55:46

Comparing /work/SRC/openSUSE:Factory/scidavis (Old)
 and  /work/SRC/openSUSE:Factory/.scidavis.new.4811 (New)


Package is "scidavis"

Wed Jun 19 20:55:46 2019 rev:3 rq:699954 version:1.25

Changes:

--- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes2018-04-25 
10:03:00.987177627 +0200
+++ /work/SRC/openSUSE:Factory/.scidavis.new.4811/scidavis.changes  
2019-06-19 20:55:49.653848912 +0200
@@ -1,0 +2,14 @@
+Wed Apr 17 15:02:54 UTC 2019 - Christophe Giboudeaux 
+
+- Update to 1.25
+  * added support for Qt 5.x;
+  * liborigin updated;
+  * added Python 3 support
+  * Russian translation updated
+- Add 0001-Adapt-scidavis-for-openSUSE.patch
+  * install the python config file to /etc/scidavis/
+  * Add a (working) option to fix the lib vs. lib64 installation
+  * Update paths for the current qwt5-qt5 and qwtplot3d-qt5 packages
+  * Fix the Qt5 linguist executable names
+
+---

Old:

  scidavis-1.22.tar.gz

New:

  0001-Adapt-scidavis-for-openSUSE.patch
  scidavis-1.25.tar.gz



Other differences:
--
++ scidavis.spec ++
--- /var/tmp/diff_new_pack.zd4WUQ/_old  2019-06-19 20:55:50.585849725 +0200
+++ /var/tmp/diff_new_pack.zd4WUQ/_new  2019-06-19 20:55:50.589849728 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package scidavis
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Quentin Denis 
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,44 +13,40 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   scidavis
-Version:1.22
+Version:1.25
 Release:0
 Summary:An application for Scientific Data Analysis and Visualization
 License:GPL-2.0-only AND GPL-3.0-or-later
 Group:  Productivity/Scientific/Math
-Url:http://scidavis.sourceforge.net/
-Source0:
http://downloads.sourceforge.net/project/scidavis/SciDAVis/%{version}/scidavis-%{version}.tar.gz
-Source1:%{name}-rpmlintrc
-BuildRequires:  Mesa-devel
-BuildRequires:  boost-devel
-BuildRequires:  cmake
-BuildRequires:  fontconfig
-BuildRequires:  gsl
-BuildRequires:  gsl-devel
+URL:http://scidavis.sourceforge.net/
+Source0:
http://downloads.sourceforge.net/project/scidavis/SciDAVis/%{version}/%{name}-%{version}.tar.gz
+Source1:scidavis-rpmlintrc
+# PATCH-FIX-OPENSUSE
+Patch0: 0001-Adapt-scidavis-for-openSUSE.patch
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  kde4-filesystem
 BuildRequires:  liborigin-devel
-BuildRequires:  libqt4-devel
-BuildRequires:  libqt4-devel-doc
-BuildRequires:  libstdc++-devel
-BuildRequires:  muparser-devel
-BuildRequires:  python-devel
-BuildRequires:  python-qt4
-BuildRequires:  python-qt4-devel
-BuildRequires:  qt4-assistant-adp-devel
+BuildRequires:  pkgconfig
+BuildRequires:  python2-qt5-devel
 BuildRequires:  qwt-devel
 BuildRequires:  qwtplot3d-devel
-BuildRequires:  unzip
-BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5OpenGL)
+BuildRequires:  cmake(Qt5PrintSupport)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Xml)
+BuildRequires:  pkgconfig(gsl)
+BuildRequires:  pkgconfig(muparser)
 %if 0%{?suse_version} > 1220
 BuildRequires:  glu-devel
 %endif
+Recommends: %{name}-lang = %{version}
 
 %description
 SciDAVis is an interactive application for data analysis and
@@ -60,70 +56,57 @@
 applications like Origin and SigmaPlot as well as free applications like
 QtiPlot, Labplot and Gnuplot.
 
+%lang_package
+
 %prep
 %setup -q
-
-# Fix files is compiled without RPM_OPT_FLAG
-find . -type f -name \*.pro | while read FILE; do
-echo "QMAKE_CFLAGS += %{optflags}" >> "$FILE"
-echo "QMAKE_CXXFLAGS += %{optflags}" >> "$FILE"; done
+%patch0 -p1
 
 %build
-export PATH=$QTDIR/bin:$PATH
-%ifarch x86_64 ppc64 ppc64le
-export QMAKESPEC="linux-g++-64"
-%endif
-%ifarch aarch64
-# aarch64 uses QMAKESPEC="linux-g++" but will install in lib64
-sed -i "s/linux-g++-64: libsuff = 64/libsuff = 64/g" config.pri
+%qmake5 CONFIG+=python\
+%if "%{_lib}" == "lib64"
+  64BITS=1
 %endif
-qmake %{name}.pro QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags" 
QMAKE_STRIP="/bin/true";
-make %{?_smp_mflags}
+

commit scidavis for openSUSE:Factory

2018-04-25 Thread root 
Hello community,

here is the log from the commit of package scidavis for openSUSE:Factory 
checked in at 2018-04-25 10:02:59

Comparing /work/SRC/openSUSE:Factory/scidavis (Old)
 and  /work/SRC/openSUSE:Factory/.scidavis.new (New)


Package is "scidavis"

Wed Apr 25 10:02:59 2018 rev:2 rq:600809 version:1.22

Changes:

--- /work/SRC/openSUSE:Factory/scidavis/scidavis.changes2018-02-22 
15:02:00.650943192 +0100
+++ /work/SRC/openSUSE:Factory/.scidavis.new/scidavis.changes   2018-04-25 
10:03:00.987177627 +0200
@@ -1,0 +2,6 @@
+Wed Apr 18 14:05:27 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Handle aarch64 arch
+- Make use of optflags
+
+---



Other differences:
--
++ scidavis.spec ++
--- /var/tmp/diff_new_pack.Bek1hi/_old  2018-04-25 10:03:01.935142844 +0200
+++ /var/tmp/diff_new_pack.Bek1hi/_new  2018-04-25 10:03:01.935142844 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package scidavis
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Quentin Denis 
 #
 # All modifications and additions to the file contributed by third parties
@@ -21,7 +21,7 @@
 Version:1.22
 Release:0
 Summary:An application for Scientific Data Analysis and Visualization
-License:GPL-2.0 AND GPL-3.0+
+License:GPL-2.0-only AND GPL-3.0-or-later
 Group:  Productivity/Scientific/Math
 Url:http://scidavis.sourceforge.net/
 Source0:
http://downloads.sourceforge.net/project/scidavis/SciDAVis/%{version}/scidavis-%{version}.tar.gz
@@ -73,7 +73,11 @@
 %ifarch x86_64 ppc64 ppc64le
 export QMAKESPEC="linux-g++-64"
 %endif
-qmake %{name}.pro
+%ifarch aarch64
+# aarch64 uses QMAKESPEC="linux-g++" but will install in lib64
+sed -i "s/linux-g++-64: libsuff = 64/libsuff = 64/g" config.pri
+%endif
+qmake %{name}.pro QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags" 
QMAKE_STRIP="/bin/true";
 make %{?_smp_mflags}
 
 %install