Compare commits

...

No commits in common. "imports/c9/thermald-2.5-3.el9" and "c8" have entirely different histories.

4 changed files with 38 additions and 50 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/thermald-2.5.tar.gz SOURCES/thermald-2.5.1.tar.gz

View File

@ -1 +1 @@
24d6d30a68a9c313800dcdc45b3da2b2431b1a3b SOURCES/thermald-2.5.tar.gz 67440e49a34a7572fc3d18233c3b9546919c5281 SOURCES/thermald-2.5.1.tar.gz

View File

@ -0,0 +1,15 @@
diff --git a/src/main.cpp b/src/main.cpp
index 6e2f5e4..b4b9317 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -51,6 +51,10 @@
#define TD_DIST_VERSION PACKAGE_VERSION
#endif
+#ifndef G_SOURCE_FUNC
+#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
+#endif
+
#define EXIT_UNSUPPORTED 2
extern int thd_dbus_server_init(gboolean (*exit_handler)(void));

View File

@ -7,20 +7,17 @@
Name: thermald Name: thermald
Version: 2.5 Version: 2.5.1
Release: 3%{?dist} Release: 1%{?dist}
Summary: Thermal Management daemon Summary: Thermal Management daemon
# thd_cdev_modem.{cpp,h} is currently GPLv2 only License: GPLv2+
# https://github.com/intel/thermal_daemon/issues/306
License: GPLv2
URL: https://github.com/intel/%{pkgname} URL: https://github.com/intel/%{pkgname}
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# No cpuid.h on other arches. # No cpuid.h on other arches.
ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64
BuildRequires: make
BuildRequires: autoconf autoconf-archive BuildRequires: autoconf autoconf-archive
BuildRequires: automake BuildRequires: automake
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
@ -42,6 +39,8 @@ Requires(pre): shadow-utils
# Upstream removed the internal copy of qcustomplot, add it back as we don't have it in RHEL. # Upstream removed the internal copy of qcustomplot, add it back as we don't have it in RHEL.
# The alternative would be removing the GUI package # The alternative would be removing the GUI package
Patch9000: qcustomplot.patch Patch9000: qcustomplot.patch
# G_SOURCE_FUNC only exists with GLib >= 2.58
Patch9001: g-source-func.patch
%description %description
%{name} monitors and controls platform temperature. %{name} monitors and controls platform temperature.
@ -60,8 +59,6 @@ BuildRequires: qt5-qtbase-devel
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: %{name}%{?_isa} == %{version}-%{release} Requires: %{name}%{?_isa} == %{version}-%{release}
Provides: bundled(qcustomplot) = 2.0.0-beta
%description monitor %description monitor
This package contains an Application to monitor %{name} for system This package contains an Application to monitor %{name} for system
developers who want to enable application developers and their developers who want to enable application developers and their
@ -251,57 +248,33 @@ exit 0
%changelog %changelog
* Mon Dec 19 2022 Bastien Nocera <bnocera@redhat.com> - 2.5.1-1
- Update to 2.5.1
Resolves: rhbz#2114048
* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-3 * Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-3
- Accept 2.5 as package version - Accept 2.5 as package version
Related: #2040081 Related: #2040080
* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-2 * Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-2
- Fix version test script - Fix version test script
Related: #2040081 Related: #2040080
* Fri Jul 22 2022 Benjamin Berg <bberg@redhat.com> - 2.5-1 * Fri Jul 22 2022 Benjamin Berg <bberg@redhat.com> - 2.5-1
- Update to 2.5 - Update to 2.5
Resolves: #2040081 Resolves: #2040080
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.6-2 * Fri Nov 12 2021 Benjamin Berg <bberg@redhat.com> - 2.4.6-1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Update to 2.4.6 and newer CPU model support
Related: rhbz#1991688 Resolves: #1999368
* Thu Jun 10 2021 Benjamin Berg <bberg@redhat.com> - 2.4.6-1 * Thu Dec 10 2020 Benjamin Berg <bberg@redhat.com> - 2.4.1-2
- Update to 2.4.6 (#1965783) - Fix problems reported by coverity
- Update main license to GPLv2 only for now Related: #1875505
- Add bundled(qcustomplot) for monitor subpackage
- Resolves: #1961047
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.1-4 * Tue Dec 08 2020 Benjamin Berg <bberg@redhat.com> - 2.4.1-1
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Update to thermald 2.4.1
Resolves: #1875505
* Tue Feb 02 2021 Benjamin Berg <bberg@redhat.com> - 2.4.1-3
- Add upstream patch fixing parsing of passive targets
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 01 2020 Benjamin Berg <bberg@redhat.com> - 2.4.1-1
- New upstream release (#1903094)
* Thu Nov 26 2020 Benjamin Berg <bberg@redhat.com> - 2.4-1
- New upstream release (#1901810)
Resolves: #1894178
Resolves: #1892534
* Tue Sep 01 2020 Benjamin Berg <bberg@redhat.com> - 2.3-2
- Fix Lenovo kill switch (#1874462)
* Tue Aug 25 2020 Benjamin Berg <bberg@redhat.com> - 2.3-1
- New upstream release 2.3 (rhbz#1866784)
- Add patch to fix printf on non-64 bit
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 08 2020 Benjamin Berg <bberg@redhat.com> - 2.2-1
- New upstream release 2.2 (rhbz#1827883)
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-2 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild