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.changes 2018-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 <[email protected]> + +- 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 <[email protected]> # # 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} + +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install +%qmake5_install -# https://github.com/highperformancecoder/scidavis/issues/48 mkdir -p %{buildroot}%{_datadir}/%{name}/translations cp %{name}/translations/%{name}_*.qm %{buildroot}%{_datadir}/%{name}/translations/ + %find_lang %{name} --with-qt # Remove unneeded files. rm -rf %{buildroot}%{_datadir}/doc/%{name} -%post -%desktop_database_post -%icon_theme_cache_post -%mime_database_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%mime_database_postun - -%files -f %{name}.lang -%doc CHANGES README.md gpl.txt LICENSE -%{_bindir}/%{name} -%{_libdir}/%{name} -%{_datadir}/%{name} -%dir %{_datadir}/appdata -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/mimelnk -%dir %{_datadir}/mimelnk/application/ -%{_datadir}/mimelnk/application/x-sciprj.desktop -%{_mandir}/man1/%{name}.1* -%{_datadir}/icons/hicolor/*/apps/%{name}.* +%files lang -f %{name}.lang +%dir %{_datadir}/scidavis +%dir %{_datadir}/scidavis/translations + +%files +%license LICENSE +%doc ChangeLog.md README.md %dir %{_datadir}/icons/locolor %dir %{_datadir}/icons/locolor/16x16 %dir %{_datadir}/icons/locolor/16x16/apps -%{_datadir}/icons/locolor/16x16/apps/scidavis.png %dir %{_datadir}/icons/locolor/22x22 %dir %{_datadir}/icons/locolor/22x22/apps -%{_datadir}/icons/locolor/22x22/apps/scidavis.png %dir %{_datadir}/icons/locolor/32x32 %dir %{_datadir}/icons/locolor/32x32/apps -%{_datadir}/icons/locolor/32x32/apps/scidavis.png -%{_datadir}/mime/packages/scidavis.xml +%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}/ +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_sysconfdir}/scidavis/ %changelog ++++++ 0001-Adapt-scidavis-for-openSUSE.patch ++++++ >From bef81a09e0af1033bd3daac8441e094d9068877a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Sat, 27 Apr 2019 19:50:04 +0200 Subject: [PATCH] Adapt scidavis for openSUSE - 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 --- config.pri | 21 ++++++++++--------- fitPlugins/exp_saturation/exp_saturation.pro | 1 - fitPlugins/explin/explin.pro | 1 - fitPlugins/fitRational0/fitRational0.pro | 1 - fitPlugins/fitRational1/fitRational1.pro | 1 - .../planck_wavelength/planck_wavelength.pro | 1 - libscidavis/libscidavis.pro | 1 - 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/config.pri b/config.pri index 377a0a3..35028d8 100644 --- a/config.pri +++ b/config.pri @@ -74,6 +74,11 @@ unix:message(Building with preset $$PRESET) ### and/or copy files to the desired locations by other means. # ################################################################################ +### 64bit Linux only suffix +contains(64BITS, 1) { libsuff=64 } + +unix:LIBS += -L/usr/lib$${libsuff} + unix {# Linux / MacOS X contains(PRESET, self_contained) { ### Unless you're trying to build a self-contained bundle, see the @@ -120,12 +125,12 @@ unix {# Linux / MacOS X ### directory specified here or somewhere else in the python path (sys.path) where "import" can find it ### where scidavisrc.py is searched for at runtime - pythonconfig.path = "$$INSTALLBASE/../etc" + pythonconfig.path = "$$INSTALLBASE/../etc/scidavis" ### where the scidavisUtil python module is searched for at runtime pythonutils.path = "$$INSTALLBASE/share/scidavis" ### where plugins are expected by default - plugins.path = "$$INSTALLBASE/lib/scidavis/plugins" + plugins.path = "$$INSTALLBASE/lib$${libsuff}/scidavis/plugins" } ###################### DESKTOP INTEGRATION ################################## @@ -181,10 +186,6 @@ win32 {# Windows plugins.path = "$$INSTALLBASE/fitPlugins" } -### 64bit Linux only suffix -linux-g++-64: libsuff = 64 -unix:LIBS += -L/usr/lib$${libsuff} - ################################################################################ ### Optional features # ################################################################################ @@ -283,8 +284,8 @@ contains(PRESET, linux_package) { ### cause problems. equals(QT_MAJOR_VERSION, 5) { - exists(/usr/include/qt5/qwt5-qt5) {INCLUDEPATH+=/usr/include/qt5/qwt5-qt5} - exists(/usr/include/qt5/qwtplot3d-qt5) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d-qt5} + exists(/usr/include/qt5/qwt5) {INCLUDEPATH+=/usr/include/qt5/qwt5} + exists(/usr/include/qt5/qwtplot3d) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d} system (ls /usr/lib*/libqwt5-qt5.so) { LIBS+=-lqwt5-qt5 @@ -405,7 +406,7 @@ exists(/usr/bin/lupdate-qt4) { LRELEASE_BIN = lrelease-qt4 } else { # anything else - LUPDATE_BIN = lupdate - LRELEASE_BIN = lrelease + LUPDATE_BIN = lupdate-qt5 + LRELEASE_BIN = lrelease-qt5 } diff --git a/fitPlugins/exp_saturation/exp_saturation.pro b/fitPlugins/exp_saturation/exp_saturation.pro index 200c14b..a4a50e1 100644 --- a/fitPlugins/exp_saturation/exp_saturation.pro +++ b/fitPlugins/exp_saturation/exp_saturation.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = exp_saturation diff --git a/fitPlugins/explin/explin.pro b/fitPlugins/explin/explin.pro index 67475e2..a633270 100644 --- a/fitPlugins/explin/explin.pro +++ b/fitPlugins/explin/explin.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = explin diff --git a/fitPlugins/fitRational0/fitRational0.pro b/fitPlugins/fitRational0/fitRational0.pro index fdc4373..1e30591 100644 --- a/fitPlugins/fitRational0/fitRational0.pro +++ b/fitPlugins/fitRational0/fitRational0.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational0 diff --git a/fitPlugins/fitRational1/fitRational1.pro b/fitPlugins/fitRational1/fitRational1.pro index e632e78..9a04421 100644 --- a/fitPlugins/fitRational1/fitRational1.pro +++ b/fitPlugins/fitRational1/fitRational1.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = fitRational1 diff --git a/fitPlugins/planck_wavelength/planck_wavelength.pro b/fitPlugins/planck_wavelength/planck_wavelength.pro index ae22122..a7201d2 100644 --- a/fitPlugins/planck_wavelength/planck_wavelength.pro +++ b/fitPlugins/planck_wavelength/planck_wavelength.pro @@ -1,5 +1,4 @@ QMAKE_PROJECT_DEPTH = 0 -linux-g++-64: libsuff=64 include(../../config.pri) TARGET = planck_wavelength diff --git a/libscidavis/libscidavis.pro b/libscidavis/libscidavis.pro index 51dbf79..0a4762b 100644 --- a/libscidavis/libscidavis.pro +++ b/libscidavis/libscidavis.pro @@ -47,6 +47,5 @@ include( muparser.pri ) python {include( python.pri )} - ############################################################################# ############################################################################# -- 2.21.0 ++++++ scidavis-1.22.tar.gz -> scidavis-1.25.tar.gz ++++++ /work/SRC/openSUSE:Factory/scidavis/scidavis-1.22.tar.gz /work/SRC/openSUSE:Factory/.scidavis.new.4811/scidavis-1.25.tar.gz differ: char 12, line 1
