public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cinnamon-settings-daemon] rawhide: Remove stale '%{?rhel:ppc ppc64}' conditionals
Date: Sun, 26 Jul 2026 21:08:41 GMT [thread overview]
Message-ID: <178510012145.1.374884100156388374.rpms-cinnamon-settings-daemon-03d0b4ad9b2e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cinnamon-settings-daemon
Branch : rawhide
Commit : 03d0b4ad9b2e7d0d2d49aa60fe247b053c7035dc
Author : Michal Schorm <mschorm@redhat.com>
Date : 2026-07-26T18:59:39+02:00
Stats : +3/-3 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/cinnamon-settings-daemon/c/03d0b4ad9b2e7d0d2d49aa60fe247b053c7035dc?branch=rawhide
Log:
Remove stale '%{?rhel:ppc ppc64}' conditionals
The wacom-related architecture conditionals used
'%ifnarch s390 s390x %{?rhel:ppc ppc64}' to also exclude ppc and
ppc64 when building on RHEL. This RHEL conditional is stale:
- Cinnamon is a Fedora-only package and was never shipped in RHEL
- The conditionals were added in commit 4bb83aa (2014-04-14, "add
wacom") with EPEL aspirations
- The spec was "revived" in commit e894f48 (2018-11-29, per
https://pagure.io/releng/issue/7938) which also carried RHEL
blocks including '%if (0%{?rhel} && 0%{?rhel <= 7})'
- ppc and ppc64 are long-retired architectures in both Fedora and
RHEL
The 's390 s390x' exclusion remains valid — those architectures
lack wacom tablet hardware support.
Affected locations (3 occurrences):
- BuildRequires: 'pkgconfig(libwacom)', 'pkgconfig(librsvg-2.0)'
- '%meson' build option: '-Duse_wacom=disabled'
- '%files' section: wacom helper binaries
Co-Authored-By: Claude AI <noreply@anthropic.com>
---
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index 113f24b..4f215a8 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -39,7 +39,7 @@ BuildRequires: pkgconfig(pango) >= 1.20.0
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97
BuildRequires: pkgconfig(libpulse) >= 0.9.16
BuildRequires: pkgconfig(upower-glib) >= 0.99.11
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
+%ifnarch s390 s390x
BuildRequires: pkgconfig(libwacom) >= 0.7
BuildRequires: pkgconfig(librsvg-2.0) >= 2.36.2
%endif
@@ -60,7 +60,7 @@ handles global keybindings, and many of desktop-wide settings.
%meson \
-Duse_smartcard=disabled \
-Dgtk_layer_shell=true \
-%ifarch s390 s390x %{?rhel:ppc ppc64}
+%ifarch s390 s390x
-Duse_wacom=disabled
%endif
@@ -102,7 +102,7 @@ rm -rf %{buildroot}%{_libdir}/cinnamon-settings-daemon/
%{_libexecdir}/csd-screensaver-proxy
%{_libexecdir}/csd-settings-remap
%{_libexecdir}/csd-xsettings
-%ifnarch s390 s390x %{?rhel:ppc ppc64}
+%ifnarch s390 s390x
%{_libexecdir}/csd-wacom-oled-helper
%{_libexecdir}/csd-wacom-led-helper
%{_libexecdir}/csd-wacom
reply other threads:[~2026-07-26 21:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178510012145.1.374884100156388374.rpms-cinnamon-settings-daemon-03d0b4ad9b2e@fedoraproject.org \
--to=mschorm@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox