Compare commits
8 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15baea3d39 | ||
|
|
6d3c3a8141 | ||
|
|
071e54fa0c | ||
|
|
b63b93e1f5 | ||
|
|
ec22fcf078 | ||
| 26097489b9 | |||
|
26484cb500 |
|||
|
|
138a169335 |
6 changed files with 23 additions and 35 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
3
README.packit
Normal file
3
README.packit
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
This repository is maintained by packit.
|
||||
https://packit.dev/
|
||||
The file was generated using packit 0.106.0.
|
||||
16
packit.yaml
Normal file
16
packit.yaml
Normal file
|
|
@ -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
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zcfan-1.3.0.tar.gz) = b45290973b1f60cad1100e63a416246c7e164388fa9bd1bcccdf07cae07f31466d66e2229bb2a5a55af2e8935e5d5f33fca18fab350cf5947775aad6768173ef
|
||||
SHA512 (zcfan-1.4.0.tar.gz) = 5d0a59817450fcbc262af43ba4bea2e130457972c9d6441211d0e80de797c4c74c2b35f86f152ac9f78a07afc37dc9d1df55e9dac2c9597d24361c15a07b60b3
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
From 3ba68de7e7afffd92135f59d897a0612a1f9004a Mon Sep 17 00:00:00 2001
|
||||
From: Michel Lind <salimma@fedoraproject.org>
|
||||
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 <salimma@fedoraproject.org>
|
||||
---
|
||||
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
|
||||
|
|
@ -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
|
||||
|
|
@ -22,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}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue