Hello community, here is the log from the commit of package QtDMM for openSUSE:Factory checked in at 2018-02-16 21:44:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QtDMM (Old) and /work/SRC/openSUSE:Factory/.QtDMM.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QtDMM" Fri Feb 16 21:44:16 2018 rev:19 rq:577080 version:0.9.8 Changes: -------- --- /work/SRC/openSUSE:Factory/QtDMM/QtDMM.changes 2014-08-05 13:00:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.QtDMM.new/QtDMM.changes 2018-02-16 21:44:21.579764221 +0100 @@ -1,0 +2,29 @@ +Fri Feb 9 14:36:24 UTC 2018 - [email protected] + +- Update to version 0.9.8 + * Use gold linker. + * Added HoldPeak HP-90EPC (tstenner). + * Use pkgconfig for spec file. + version 0.9.7 + * Added Voltcraft VC870 (Florian Evers) + * Added VA symbols to display apparent power + * Added cosphi symbols to display the power factor + version 0.9.6 + * Code clean up + * fix translation loading + * Fix message handler + * Fix file export (leading zero of the time stamp) + * Fix console logging on Windows + * Remove 1/10s sample rate -> don't work with most devices + * Use infinity sign to set endless recoder + * Fix hang of M-4660A + version 0.9.5 + * Port to Qt5 + * Use C++14 + * Add translation support + +- Switch to fork of the original project that supports Qt5 + +- Added QtDMM-0.9.2-newmodels.patch + +------------------------------------------------------------------- Old: ---- qtdmm-0.9.0.tgz New: ---- QtDMM-0.9.2-newmodels.patch QtDMM-0.9.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QtDMM.spec ++++++ --- /var/tmp/diff_new_pack.D6s8s2/_old 2018-02-16 21:44:22.259739698 +0100 +++ /var/tmp/diff_new_pack.D6s8s2/_new 2018-02-16 21:44:22.263739553 +0100 @@ -1,7 +1,7 @@ # # spec file for package QtDMM # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,23 @@ Name: QtDMM -Version: 0.9.0 +Version: 0.9.8 Release: 0 Summary: DMM Readout Software Including a Configurable Recorder -License: GPL-3.0+ +License: GPL-3.0 Group: System/GUI/Other -Url: http://mtoussaint.de/qtdmm.html -Source: http://mtoussaint.de/qtdmm-%{version}.tgz -BuildRequires: libqt4-devel +URL: https://github.com/tuxmaster/QtDMM +Source: https://github.com/tuxmaster/QtDMM/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM QtDMM-0.9.2-newmodels.patch +Patch0: QtDMM-0.9.2-newmodels.patch +BuildRequires: binutils-gold +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(Qt5Core) >= 5.5 +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5SerialPort) +BuildRequires: pkgconfig(Qt5Widgets) %description QtDMM is a DMM readout software including a configurable recorder. The @@ -42,27 +49,24 @@ %prep %setup -q +%patch0 -p1 %build -qmake +%qmake5 make %{?_smp_mflags} %install -%make_install -gzip qtdmm.1 - install -d %{buildroot}%{_bindir} install bin/qtdmm %{buildroot}%{_bindir}/qtdmm -install -Dm 644 qtdmm.1.gz %{buildroot}%{_mandir}/man1/qtdmm.1.gz +install -Dm 644 qtdmm.1 %{buildroot}%{_mandir}/man1/qtdmm.1 install -Dm 644 qtdmm.png %{buildroot}%{_datadir}/pixmaps/qtdmm.png install -Dm 644 QtDMM.desktop %{buildroot}%{_datadir}/applications/QtDMM.desktop %suse_update_desktop_file -G "DMM Readout Software" -r %{name} "Education;Engineering" %files -%defattr(-,root,root) %doc CHANGELOG LICENSE README %{_bindir}/qtdmm -%{_mandir}/man1/qtdmm.1.gz +%{_mandir}/man1/qtdmm.1%{ext_man} %{_datadir}/pixmaps/qtdmm.png %{_datadir}/applications/QtDMM.desktop ++++++ QtDMM-0.9.2-newmodels.patch ++++++ From: Luigi Baldoni <[email protected]> Date: 2018-02-09 16:58:22 +0100 Subject: Add support for extra hardware Add support for UniTrend UT61B/UT61D and Metex M-3840D that had been added in 0.9.2 post-fork. Index: QtDMM-0.9.8/src/sources/dmmprefs.cpp =================================================================== --- QtDMM-0.9.8.orig/src/sources/dmmprefs.cpp +++ QtDMM-0.9.8/src/sources/dmmprefs.cpp @@ -81,6 +81,7 @@ struct DMMInfo dmm_info[] = { {"Metex M-3660D", 1, 0, 7, 2, 1, 0, 1, 0, 0,1,1,1}, {"Metex M-3830D", 1, 0, 7, 2, 4, 0, 1, 0, 0,1,1,1}, // no image + {"Metex M-3840D", 1, 0, 7, 2, 4, 0, 1, 0, 0,1,1,1}, {"Metex M-3850D", 1, 0, 7, 2, 4, 0, 1, 0, 0,1,1,1}, {"Metex M-3850M", 5, 0, 7, 2, 4, 0, 1, 0, 0,1,1,1}, {"Metex M-3870D", 1, 0, 7, 1, 1, 0, 1, 0, 0,1,1,1}, @@ -112,6 +113,8 @@ struct DMMInfo dmm_info[] = { {"Uni-Trend UT30A", 3, 5, 8, 1, 1, 0, 1, 0, 0,1,1,1}, {"Uni-Trend UT30E", 3, 5, 8, 1, 1, 0, 1, 0, 0,1,1,1}, // no image + {"Uni-Trend UT61B", 3, 8, 8, 1, 1, 0, 1, 0, 0,1,1,1}, // no image + {"Uni-Trend UT61D", 3, 8, 8, 1, 1, 0, 8, 0, 0,0,0,1}, // no image {"Voltcraft M-3610D", 1, 0, 7, 2, 1, 0, 1, 0, 0,1,1,1}, // no image {"Voltcraft M-3650D", 1, 0, 7, 2, 1, 0, 1, 0, 0,1,1,1},
