Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package upsm for openSUSE:Factory checked in
at 2022-10-28 19:31:25
Comparing /work/SRC/openSUSE:Factory/upsm (Old)
and /work/SRC/openSUSE:Factory/.upsm.new.2275 (New)
Package is "upsm"
Fri Oct 28 19:31:25 2022 rev:4 rq:1031832 version:3.0.0
Changes:
--- /work/SRC/openSUSE:Factory/upsm/upsm.changes2019-04-26
22:54:31.845312018 +0200
+++ /work/SRC/openSUSE:Factory/.upsm.new.2275/upsm.changes 2022-10-28
19:32:06.223405633 +0200
@@ -1,0 +2,7 @@
+Sat Oct 15 11:02:34 UTC 2022 - Martin Hauke
+
+- Update to version 3.0.0
+ * upsm ported to Qt6 (Qt5 still ok)
+ * misc. fixes
+
+---
Old:
upsm-2.2.0.tar.gz
New:
upsm-3.0.0.tar.gz
Other differences:
--
++ upsm.spec ++
--- /var/tmp/diff_new_pack.DjgFjJ/_old 2022-10-28 19:32:06.711408081 +0200
+++ /var/tmp/diff_new_pack.DjgFjJ/_new 2022-10-28 19:32:06.719408121 +0200
@@ -1,7 +1,7 @@
#
# spec file for package upsm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: upsm
-Version:2.2.0
+Version:3.0.0
Release:0
Summary:Qt-based ups monitor (front-end for upsc from Network UPS
Tools)
License:SUSE-Public-Domain
++ upsm-2.2.0.tar.gz -> upsm-3.0.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/upsm-2.2.0/CMakeLists.txt
new/upsm-3.0.0/CMakeLists.txt
--- old/upsm-2.2.0/CMakeLists.txt 2019-04-24 12:28:31.0 +0200
+++ new/upsm-3.0.0/CMakeLists.txt 2022-10-15 11:22:20.0 +0200
@@ -1,39 +1,37 @@
cmake_minimum_required(VERSION 3.0)
set (QT_MIN_VERSION "5.4.0")
-include_directories(${Qt5Widgets_INCLUDE_DIRS})
-add_definitions(${Qt5Widgets_DEFINITIONS})
-
-set(PROJECT "upsm")
-project ($PROJECT VERSION 2.2.0)
-
-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
+enable_language(CXX)
+enable_language(C)
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-if(BUILD_TESTING)
- find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+
+if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt6")
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Core5Compat REQUIRED)
endif()
-qt5_add_resources(QT_RESOURCES upsm.qrc)
+if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt5")
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
+endif()
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} -fuse-ld=gold")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+message(Qt${QT_VERSION_MAJOR} " found")
+include_directories(${Qt${QT_VERSION_MAJOR}Widgets_INCLUDE_DIRS})
+add_definitions(${Qt${QT_VERSION_MAJOR}Widgets_DEFINITIONS})
+add_definitions(${Qt${QT_VERSION_MAJOR}Widgets_COMPILE_DEFINITIONS})
+
+
+set(PROJECT "upsm")
+project ($PROJECT VERSION 3.0.0)
+add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
-if (UNIX AND NOT APPLE)
- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
ERROR_QUIET OUTPUT_VARIABLE ld_version)
- if ("${ld_version}" MATCHES "GNU gold")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold
-Wl,--disable-new-dtags")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold
-Wl,--disable-new-dtags")
- endif()
-endif()
# Populate a CMake variable with the sources
set(upsm_SRCS
@@ -55,16 +53,44 @@
)
+
add_custom_target(dist
-COMMAND git archive
--prefix=${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}/
master | bzip2
>${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.tar.bz2
+COMMAND git archive --format=tar
--prefix=${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}/
HEAD | gzip
>${PROJECT}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.tar.gz
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
)
+find_package(Qt${QT_VERSION_MAJOR} CONFIG REQUIRED Core Widgets)
+
+
+if(BUILD_TESTING)
+ find_package(Qt${Test}${QT_VERSION_MAJOR} CONFIG REQUIRED)
+endif()
+
+
+if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt6")
+qt6_add_resources(QT_RESOURCES upsm.qrc)
+endif()
+
+if (Qt${QT_VERSION_MAJOR} MATCHES "Qt5")
