From efbe1b332a595b3c37e9cb0e9f6acfe5dbe8b3a8 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Dec 18 2019 12:50:05 +0000 Subject: New upstream release 1.9 (rhbz#1782249) - Drop Patch0, it has been merged upstream --- diff --git a/0001-Use-correct-format-specifier-for-size_t.patch b/0001-Use-correct-format-specifier-for-size_t.patch deleted file mode 100644 index 5ddc094..0000000 --- a/0001-Use-correct-format-specifier-for-size_t.patch +++ /dev/null @@ -1,47 +0,0 @@ -From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Thu, 1 Aug 2019 08:15:52 +0800 -Subject: [PATCH 1/3] Use correct format specifier for size_t - -%zu instead of %lu, otherwise on 32 bit: - -| In file included from ../git/src/thd_common.h:27, -| from ../git/src/thd_zone.h:30, -| from ../git/src/thd_zone.cpp:34: -| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)': -| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector::size_type' {aka 'unsigned int'} [-Werror=format=] -| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ -| | | -| | std::vector::size_type {aka unsigned int} -| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info' -| 82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__) -| | ^~~~~~~~~~~ -| ../git/src/thd_zone.cpp:322:38: note: format string is defined here -| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); -| | ~~^ -| | | -| | long unsigned int -| | %u - -Signed-off-by: Anuj Mittal ---- - src/thd_zone.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp -index dd485d9..eb81d61 100644 ---- a/src/thd_zone.cpp -+++ b/src/thd_zone.cpp -@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) { - void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip) - { - if (trip_points.size()) { -- thd_log_info("trip_points.size():%lu\n", trip_points.size()); -+ thd_log_info("trip_points.size():%zu\n", trip_points.size()); - for (unsigned int j = trip_points.size() - 1;; --j) { - if (trip_points[j].get_trip_type() == trip.get_trip_type()) { - thd_log_info("updating existing trip temp \n"); --- -2.21.0 - diff --git a/sources b/sources index 531d12f..eb6579e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thermald-1.9.tar.gz) = 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8 +SHA512 (thermald-1.9.1.tar.gz) = 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1 diff --git a/thermald.spec b/thermald.spec index 5ec6b43..2807145 100644 --- a/thermald.spec +++ b/thermald.spec @@ -7,7 +7,7 @@ Name: thermald -Version: 1.9 +Version: 1.9.1 Release: 1%{?dist} Summary: Thermal Management daemon @@ -32,8 +32,6 @@ Requires: dbus%{?_isa} Requires(pre): glibc-common Requires(pre): shadow-utils -Patch001: 0001-Use-correct-format-specifier-for-size_t.patch - %{?systemd_requires} %description @@ -242,6 +240,10 @@ exit 0 %changelog +* Wed Dec 18 2019 Benjamin Berg - 1.9.1-1 +- New upstream release 1.9 (rhbz#1782249) +- Drop Patch0, it has been merged upstream + * Fri Sep 20 2019 Christian Kellner - 1.9-1 - New upstream release 1.9 (rhbz#1742290) - Update patch0 (taken from upstream, commit dcdaf52...)