From 96d8b1be55db9f7eb097bd02e41ae7f93dfb7342 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:12:57 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 2003a5cb15c79d1151b32bb273f1e98cf7e0dc40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:38:17 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 369e4c506c2591d180700d889e9b7e0e95288bb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:01:31 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8ddf524dbbb9b1c7680fbb5f92c93cd58afde755 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 4 Mar 2024 15:13:06 -0600 Subject: [PATCH 04/13] Update to 1.3.0 (rhbz#2267149) Signed-off-by: Michel Lind --- .gitignore | 1 + sources | 2 +- zcfan.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a78f928..0214ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zcfan-1.1.1.tar.gz /zcfan-1.2.0.tar.gz /zcfan-1.2.1.tar.gz +/zcfan-1.3.0.tar.gz diff --git a/sources b/sources index d8d4a9d..29f928e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zcfan-1.2.1.tar.gz) = f05e9d05f369cba8e023181cada7f61219ce836071cac3203bf8162e68cc32022046c0391634ce6fbfbbd776c8d11821b3e0ba41e5002c05263a01ff7b452fbf +SHA512 (zcfan-1.3.0.tar.gz) = b45290973b1f60cad1100e63a416246c7e164388fa9bd1bcccdf07cae07f31466d66e2229bb2a5a55af2e8935e5d5f33fca18fab350cf5947775aad6768173ef diff --git a/zcfan.spec b/zcfan.spec index 8de594a..150dfe6 100644 --- a/zcfan.spec +++ b/zcfan.spec @@ -1,5 +1,5 @@ Name: zcfan -Version: 1.2.1 +Version: 1.3.0 Release: %autorelease Summary: Zero-configuration fan daemon for ThinkPads From a44f383e45bd58aee3a4d10ea679f0fbe5503003 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 4 Mar 2024 15:53:58 -0600 Subject: [PATCH 05/13] Mark zcfan.service as conflicting with thinkfan.service Signed-off-by: Michel Lind --- ...n-mark-service-conflict-with-thinkfan.diff | 31 +++++++++++++++++++ zcfan.spec | 1 + 2 files changed, 32 insertions(+) create mode 100644 zcfan-mark-service-conflict-with-thinkfan.diff diff --git a/zcfan-mark-service-conflict-with-thinkfan.diff b/zcfan-mark-service-conflict-with-thinkfan.diff new file mode 100644 index 0000000..7a10997 --- /dev/null +++ b/zcfan-mark-service-conflict-with-thinkfan.diff @@ -0,0 +1,31 @@ +From 3ba68de7e7afffd92135f59d897a0612a1f9004a Mon Sep 17 00:00:00 2001 +From: Michel Lind +Date: Mon, 4 Mar 2024 15:22:00 -0600 +Subject: [PATCH] Mark zcfan.service as conflicting with thinkfan.service + +In Debian the two packages are marked as conflicting with each other: +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017980 + +In Fedora we don't - as Fedora defaults to not enabling installed +services - and this does make it easier to install both side by side and +test them back to back. Marking the services as conflicting makes sure +that starting one stops the other and vice versa. + +https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#Conflicts= + +Signed-off-by: Michel Lind +--- + zcfan.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/zcfan.service b/zcfan.service +index 2a87046..ec81ae4 100644 +--- a/zcfan.service ++++ b/zcfan.service +@@ -1,5 +1,6 @@ + [Unit] + Description=Zero-configuration fan control for ThinkPad ++Conflicts=thinkfan.service + + [Service] + ExecStart=/usr/bin/zcfan diff --git a/zcfan.spec b/zcfan.spec index 150dfe6..53f8c5e 100644 --- a/zcfan.spec +++ b/zcfan.spec @@ -6,6 +6,7 @@ Summary: Zero-configuration fan daemon for ThinkPads License: MIT URL: https://github.com/cdown/zcfan Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch: %{url}/pull/27.patch#/%{name}-mark-service-conflict-with-thinkfan.diff BuildRequires: gcc BuildRequires: make From 138a169335c24d4c3d31fdacc9e815162b8a4413 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:49:27 +0000 Subject: [PATCH 06/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 26484cb50025fadd09e82ed479d07e603dbd0fcf Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 30 Dec 2024 17:38:50 -0600 Subject: [PATCH 07/13] Enable Packit [skip changelog] Signed-off-by: Michel Lind --- packit.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packit.yaml diff --git a/packit.yaml b/packit.yaml new file mode 100644 index 0000000..fdf84eb --- /dev/null +++ b/packit.yaml @@ -0,0 +1,16 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +copy_upstream_release_description: false + +jobs: +- job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + +- job: koji_build + trigger: commit + allowed_committers: ['packit'] + dist_git_branches: + - fedora-rawhide From 26097489b977f58f71b5bb523558e32f1332339a Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Mon, 30 Dec 2024 17:54:20 -0600 Subject: [PATCH 08/13] Update to 1.4.0 upstream release - Resolves: rhbz#2334766 Commit authored by Packit automation (https://packit.dev/) Signed-off-by: Michel Lind --- .gitignore | 1 + README.packit | 3 ++ sources | 2 +- ...n-mark-service-conflict-with-thinkfan.diff | 31 ------------------- zcfan.spec | 3 +- 5 files changed, 6 insertions(+), 34 deletions(-) create mode 100644 README.packit delete mode 100644 zcfan-mark-service-conflict-with-thinkfan.diff diff --git a/.gitignore b/.gitignore index 0214ed5..08e5d49 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zcfan-1.2.0.tar.gz /zcfan-1.2.1.tar.gz /zcfan-1.3.0.tar.gz +/zcfan-1.4.0.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..3826605 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.106.0. diff --git a/sources b/sources index 29f928e..8684747 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zcfan-1.3.0.tar.gz) = b45290973b1f60cad1100e63a416246c7e164388fa9bd1bcccdf07cae07f31466d66e2229bb2a5a55af2e8935e5d5f33fca18fab350cf5947775aad6768173ef +SHA512 (zcfan-1.4.0.tar.gz) = 5d0a59817450fcbc262af43ba4bea2e130457972c9d6441211d0e80de797c4c74c2b35f86f152ac9f78a07afc37dc9d1df55e9dac2c9597d24361c15a07b60b3 diff --git a/zcfan-mark-service-conflict-with-thinkfan.diff b/zcfan-mark-service-conflict-with-thinkfan.diff deleted file mode 100644 index 7a10997..0000000 --- a/zcfan-mark-service-conflict-with-thinkfan.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 3ba68de7e7afffd92135f59d897a0612a1f9004a Mon Sep 17 00:00:00 2001 -From: Michel Lind -Date: Mon, 4 Mar 2024 15:22:00 -0600 -Subject: [PATCH] Mark zcfan.service as conflicting with thinkfan.service - -In Debian the two packages are marked as conflicting with each other: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017980 - -In Fedora we don't - as Fedora defaults to not enabling installed -services - and this does make it easier to install both side by side and -test them back to back. Marking the services as conflicting makes sure -that starting one stops the other and vice versa. - -https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#Conflicts= - -Signed-off-by: Michel Lind ---- - zcfan.service | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/zcfan.service b/zcfan.service -index 2a87046..ec81ae4 100644 ---- a/zcfan.service -+++ b/zcfan.service -@@ -1,5 +1,6 @@ - [Unit] - Description=Zero-configuration fan control for ThinkPad -+Conflicts=thinkfan.service - - [Service] - ExecStart=/usr/bin/zcfan diff --git a/zcfan.spec b/zcfan.spec index 53f8c5e..4c5e362 100644 --- a/zcfan.spec +++ b/zcfan.spec @@ -1,12 +1,11 @@ Name: zcfan -Version: 1.3.0 +Version: 1.4.0 Release: %autorelease Summary: Zero-configuration fan daemon for ThinkPads License: MIT URL: https://github.com/cdown/zcfan Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch: %{url}/pull/27.patch#/%{name}-mark-service-conflict-with-thinkfan.diff BuildRequires: gcc BuildRequires: make From ec22fcf078fe3bfaca9be2106d558e020e2489be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:42:38 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b63b93e1f521fa614bf330776d5afcf4fd3f81e4 Mon Sep 17 00:00:00 2001 From: ireka Date: Sun, 9 Feb 2025 17:17:14 +0100 Subject: [PATCH 10/13] Set a correct path to zcfan binary in systemd service Fixes: RHBZ#2338425 --- zcfan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zcfan.spec b/zcfan.spec index 4c5e362..64223ec 100644 --- a/zcfan.spec +++ b/zcfan.spec @@ -21,7 +21,7 @@ zcfan is a zero-configuration fan control daemon for ThinkPads. %build %set_build_flags -%make_build +%make_build prefix=%{_prefix} %install %make_install DESTDIR=%{buildroot} prefix=%{_prefix} From 071e54fa0c45fde4644e02d6ff2173595dd6ade5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:16:39 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6d3c3a8141bf738af334e03750328740677bd475 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:06:37 +0000 Subject: [PATCH 12/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 15baea3d39d4c7cd0cb7c710965730799951fa84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:39:10 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild