Hello community, here is the log from the commit of package libsysstat-qt5 for openSUSE:Factory checked in at 2018-06-29 22:31:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsysstat-qt5 (Old) and /work/SRC/openSUSE:Factory/.libsysstat-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsysstat-qt5" Fri Jun 29 22:31:11 2018 rev:7 rq:618053 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libsysstat-qt5/libsysstat-qt5.changes 2017-10-24 22:23:01.685395044 +0200 +++ /work/SRC/openSUSE:Factory/.libsysstat-qt5.new/libsysstat-qt5.changes 2018-06-29 22:31:37.726245182 +0200 @@ -1,0 +2,12 @@ +Tue May 22 14:08:52 UTC 2018 - mvet...@suse.com + +- Update to 0.4.1: + * Bump patch version to 1 + * CMake: Prevent in-source builds + * Fixed year and https + * Fixes some lxde mentions + * Drop Qt foreach. + * Handle CMake CMP0024 + * Don't export github templates + +------------------------------------------------------------------- Old: ---- libsysstat-0.4.0.tar.xz libsysstat-0.4.0.tar.xz.asc New: ---- libsysstat-0.4.1.tar.xz libsysstat-0.4.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsysstat-qt5.spec ++++++ --- /var/tmp/diff_new_pack.IWciD5/_old 2018-06-29 22:31:38.086244907 +0200 +++ /var/tmp/diff_new_pack.IWciD5/_new 2018-06-29 22:31:38.086244907 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsysstat-qt5 # -# Copyright (c) 2015 SUSE LINUX 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 @@ -18,21 +18,21 @@ %define _name libsysstat Name: libsysstat-qt5 -Version: 0.4.0 +Version: 0.4.1 Release: 0 Summary: Query system info and statistics -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://www.lxde.org +URL: http://www.lxqt.org Source: https://github.com/lxde/%{_name}/releases/download/%{version}/%{_name}-%{version}.tar.xz Source1: https://github.com/lxde/%{_name}/releases/download/%{version}/%{_name}-%{version}.tar.xz.asc Source2: libsysstat-qt5.keyring BuildRequires: cmake >= 3.0.2 BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel >= 0.4.0 +BuildRequires: lxqt-build-tools-devel >= 0.5.0 +BuildRequires: pkgconfig BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(Qt5Core) >= 5.4.2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(Qt5Core) >= 5.7.1 %description Library used to query system info and statistics @@ -59,23 +59,21 @@ %build %cmake -DUSE_QT5=ON -%__make %{?_smp_mflags} +make %{?_smp_mflags} %install %cmake_install %post -n libsysstat-qt5-0 -p /sbin/ldconfig - %postun -n libsysstat-qt5-0 -p /sbin/ldconfig %files -n libsysstat-qt5-0 -%defattr(-,root,root) -%doc AUTHORS COPYING +%license COPYING +%doc AUTHORS %{_libdir}/%{name}.so.0 %{_libdir}/%{name}.so.0.* %files devel -%defattr (-,root,root) %{_includedir}/sysstat-qt5 %{_datadir}/cmake/sysstat-qt5 %{_libdir}/pkgconfig/sysstat-qt5.pc ++++++ libsysstat-0.4.0.tar.xz -> libsysstat-0.4.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/.github/ISSUE_TEMPLATE.md new/libsysstat-0.4.1/.github/ISSUE_TEMPLATE.md --- old/libsysstat-0.4.0/.github/ISSUE_TEMPLATE.md 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -<!--- Provide a general summary of the issue in the Title above --> -<!--- You could delete sections and/or questions irrelevant to your report ---> - -##### Expected Behavior -<!--- If you're describing a bug, tell us what should happen --> -<!--- If you're suggesting a change/improvement, tell us how it should work --> - -##### Current Behavior -<!--- If describing a bug, tell us what happens instead of the expected behavior --> -<!--- If suggesting a change/improvement, explain the difference from current behavior --> - -##### Possible Solution -<!--- Not obligatory, but suggest a fix/reason for the bug, --> -<!--- or ideas how to implement the addition or change --> - -##### Steps to Reproduce (for bugs) -<!--- Provide a link to a live example, or an unambiguous set of steps to --> -<!--- reproduce this bug. Include code to reproduce, if relevant --> -1. -2. -3. -4. - -##### Context -<!--- How has this issue affected you? What are you trying to accomplish? --> -<!--- Providing context helps us come up with a solution that is most useful in the real world --> - -##### System Information -<!--- Include as many relevant details about the system you experienced the bug in --> -* Distribution & Version: -* Kernel: -* Qt Version: -* libqtxdg Version: -* lxde-build-tools Version: -* Package version: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/AUTHORS new/libsysstat-0.4.1/AUTHORS --- old/libsysstat-0.4.0/AUTHORS 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/AUTHORS 2018-05-21 19:16:59.000000000 +0200 @@ -1,11 +1,11 @@ Upstream Authors: - LXQt team: http://lxqt.org + LXQt team: https://lxqt.org Razor team: http://razor-qt.org Kuzma Shapran <kuzma.shap...@gmail.com> Copyright: Copyright (c) 2012 Razor team - Copyright (c) 2012-2017 LXQt team + Copyright (c) 2012-2018 LXQt team License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/CHANGELOG new/libsysstat-0.4.1/CHANGELOG --- old/libsysstat-0.4.0/CHANGELOG 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/CHANGELOG 2018-05-21 19:16:59.000000000 +0200 @@ -1,7 +1,20 @@ -libsysstat-0.4.0 / 2017-09-23 +libsysstat-0.4.1 / 2018-05-21 ============================= + * Bump patch version to 1 + * CMake: Prevent in-source builds + * Fixed year and https + * Fixes some lxde mentions + * Bump LXQTBT_MINIMUM_VERSION to 0.4.1 + * Drop Qt foreach. + * Handle CMake CMP0024 + * Don't export github templates + +0.4.0 / 2017-09-23 +================== + + * Release 0.4.0: Update changelog * correct spelling mistake * bump version and needed version of lxqt-build-tools * liblxqt make no sense here diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/CMakeLists.txt new/libsysstat-0.4.1/CMakeLists.txt --- old/libsysstat-0.4.0/CMakeLists.txt 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/CMakeLists.txt 2018-05-21 19:16:59.000000000 +0200 @@ -4,11 +4,11 @@ set(MAJOR_VERSION 0) set(MINOR_VERSION 4) -set(PATCH_VERSION 0) +set(PATCH_VERSION 1) set(SYSSTAT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}") -set(LXQTBT_MINIMUM_VERSION "0.4.0") -set(QT_MINIMUM_VERSION "5.4.2") +set(LXQTBT_MINIMUM_VERSION "0.5.0") +set(QT_MINIMUM_VERSION "5.7.1") # additional cmake files list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -19,6 +19,7 @@ include(CMakePackageConfigHelpers) include(GNUInstallDirs) # Standard directories for installation +include(LXQtPreventInSourceBuilds) include(LXQtCreatePkgConfigFile) include(LXQtCreatePortableHeaders) include(LXQtCompilerSettings NO_POLICY_SCOPE) @@ -93,6 +94,7 @@ "MINOR_VERSION=${MINOR_VERSION}" "PATCH_VERSION=${PATCH_VERSION}" "SYSSTAT_LIBRARY" + "QT_NO_FOREACH" ) target_include_directories(${SYSSTAT_LIBRARY_NAME} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/README.md new/libsysstat-0.4.1/README.md --- old/libsysstat-0.4.0/README.md 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/README.md 2018-05-21 19:16:59.000000000 +0200 @@ -2,23 +2,37 @@ ## Overview -libsysstat is a library to query system information like CPU and memory usage or network traffic. Conceptually it's roughly similar to [libstatgrab](https://www.i-scream.org/libstatgrab), a third-party library used by LXQt as well. - -It is maintained by the LXQt project but can be used independently from this desktop environment, too. As for LXQt libsysstat is used by plugin-sysstat of lxqt-panel and hence an optional dependency of the latter. - -Note replacing both libsysstat and libstatgrab in LXQt by KDE Frameworks components is being considered but a final decision hasn't been made yet, see https://github.com/lxde/lxqt/issues/704. +libsysstat is a library to query system information like CPU and memory usage or +network traffic. Conceptually it's roughly similar to +[libstatgrab](https://www.i-scream.org/libstatgrab), a third-party library used +by LXQt as well. + +It is maintained by the LXQt project but can be used independently from this +desktop environment, too. As for LXQt libsysstat is used by plugin-sysstat of +lxqt-panel and hence an optional dependency of the latter. + +Note replacing both libsysstat and libstatgrab in LXQt by KDE Frameworks components +is being considered but a final decision hasn't been made yet, see +https://github.com/lxqt/lxqt/issues/704. ## Installation ### Sources -The only runtime dependency is qtbase. To build CMake and [lxqt-build-tools](https://github.com/lxde/lxqt-build-tools) are needed in addition, as well as optionally Git to pull latest VCS checkouts. - -Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` will normally have to be set to `/usr`, depending on the way library paths are dealt with on 64bit systems variables like `CMAKE_INSTALL_LIBDIR` may have to be set as well. +The only runtime dependency is qtbase. To build CMake and +[lxqt-build-tools](https://github.com/lxqt/lxqt-build-tools) are needed in +addition, as well as optionally Git to pull latest VCS checkouts. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` +will normally have to be set to `/usr`, depending on the way library paths are +dealt with on 64bit systems variables like `CMAKE_INSTALL_LIBDIR` may have to be +set as well. -To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. +To build run `make`, to install `make install` which accepts variable `DESTDIR` +as usual. ### Binary packages -The library is provided by all major Linux distributions like Arch Linux, Debian, Fedora and openSUSE. -Just use the distributions' package managers to search for string `libsysstat`. +The library is provided by all major Linux distributions like Arch Linux, +Debian, Fedora and openSUSE. Just use the distributions' package managers to +search for string `libsysstat`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/cmake/sysstat-config.cmake.in new/libsysstat-0.4.1/cmake/sysstat-config.cmake.in --- old/libsysstat-0.4.0/cmake/sysstat-config.cmake.in 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/cmake/sysstat-config.cmake.in 2018-05-21 19:16:59.000000000 +0200 @@ -15,8 +15,9 @@ include(CMakeFindDependencyMacro) find_dependency(Qt5Core @QT_MINIMUM_VERSION@) - -if (CMAKE_VERSION VERSION_GREATER 2.8.12) - cmake_policy(SET CMP0024 OLD) +if (NOT TARGET @SYSSTAT_LIBRARY_NAME@) + if (POLICY CMP0024) + cmake_policy(SET CMP0024 NEW) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/@SYSSTAT_LIBRARY_NAME@-targets.cmake") endif() -include("${CMAKE_CURRENT_LIST_DIR}/@SYSSTAT_LIBRARY_NAME@-targets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/cpustat.cpp new/libsysstat-0.4.1/cpustat.cpp --- old/libsysstat-0.4.0/cpustat.cpp 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/cpustat.cpp 2018-05-21 19:16:59.000000000 +0200 @@ -62,7 +62,8 @@ { mSources.clear(); - foreach (const QString &row, readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts)) + const QStringList rows = readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts); + for (const QString &row : rows) { QStringList tokens = row.split(QChar(' '), QString::SkipEmptyParts); if( (tokens.size() < 5) @@ -76,7 +77,8 @@ bool ok; - foreach (const QString &range, readAllFile("/sys/devices/system/cpu/online").split(QChar(','), QString::SkipEmptyParts)) + const QStringList ranges = readAllFile("/sys/devices/system/cpu/online").split(QChar(','), QString::SkipEmptyParts); + for (const QString &range : ranges) { int dash = range.indexOf('-'); if (dash != -1) @@ -128,7 +130,8 @@ if ( (mMonitoring == CpuStat::LoadOnly) || (mMonitoring == CpuStat::LoadAndFrequency) ) { - foreach (const QString &row, readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts)) + const QStringList rows = readAllFile("/proc/stat").split(QChar('\n'), QString::SkipEmptyParts); + for (const QString &row : rows) { if (!row.startsWith("cpu")) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/memstat.cpp new/libsysstat-0.4.1/memstat.cpp --- old/libsysstat-0.4.0/memstat.cpp 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/memstat.cpp 2018-05-21 19:16:59.000000000 +0200 @@ -53,7 +53,8 @@ qulonglong swapTotal = 0; qulonglong swapFree = 0; - foreach (const QString &row, readAllFile("/proc/meminfo").split(QChar('\n'), QString::SkipEmptyParts)) + const QStringList rows = readAllFile("/proc/meminfo").split(QChar('\n'), QString::SkipEmptyParts); + for (const QString &row : rows) { QStringList tokens = row.split(QChar(' '), QString::SkipEmptyParts); if (tokens.size() != 3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsysstat-0.4.0/netstat.cpp new/libsysstat-0.4.1/netstat.cpp --- old/libsysstat-0.4.0/netstat.cpp 2017-09-23 14:46:10.000000000 +0200 +++ new/libsysstat-0.4.1/netstat.cpp 2018-05-21 19:16:59.000000000 +0200 @@ -42,7 +42,7 @@ rows.erase(rows.begin(), rows.begin() + 2); - foreach (const QString &row, rows) + for (const QString &row : qAsConst(rows)) { QStringList tokens = row.split(QChar(':'), QString::SkipEmptyParts); if (tokens.size() != 2) @@ -74,7 +74,7 @@ rows.erase(rows.begin(), rows.begin() + 2); - foreach (const QString &row, rows) + for (const QString &row : qAsConst(rows)) { QStringList tokens = row.split(QChar(':'), QString::SkipEmptyParts); if (tokens.size() != 2)
