public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Adam Williamson <adamwill@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/slim] f45: Put a ceiling on the backgrounds version so it builds
Date: Fri, 18 Sep 2026 21:25:49 GMT	[thread overview]
Message-ID: <178976674943.1.13369992874470594412.rpms-slim-58c67a6f6811@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/slim
            Branch : f45
            Commit : 58c67a6f6811ed7494b10d70576155b08c5c2489
            Author : Adam Williamson <adamwill@fedoraproject.org>
            Date   : 2026-09-18T14:07:37-07:00
            Stats  : +10/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/slim/c/58c67a6f6811ed7494b10d70576155b08c5c2489?branch=f45

            Log:
            Put a ceiling on the backgrounds version so it builds

There isn't always a matching fNN-backgrounds package for Rawhide.
So using %{fedora} isn't really safe. I can't think of a better
hack than this :| The ceiling will need to be manually updated as
new backgrounds packages are created.

---
diff --git a/slim.spec b/slim.spec
index 31f952b..37a09be 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,3 +1,10 @@
+# Bump this to the highest available fNN-backgrounds at the time of build
+%if 0%{?fedora} > 45 || 0%{?fedora} == 0
+%global bgver 45
+%else
+%global bgver %{?fedora}
+%endif
+
 Name:           slim
 Version:        1.4.0
 Release:        17%{?dist}
@@ -38,7 +45,7 @@ BuildRequires:  pkgconfig gettext libselinux-devel pam-devel cmake
 BuildRequires:  scrot xterm freeglut-devel libXrandr-devel
 BuildRequires:  cmake
 BuildRequires:  ImageMagick
-BuildRequires:  f%{?fedora}-backgrounds-base
+BuildRequires:  f%{bgver}-backgrounds-base
 
 Requires:       scrot xterm /sbin/shutdown
 Requires:       %{_sysconfdir}/pam.d
@@ -86,8 +93,8 @@ install -d -m755 %{buildroot}%{_sysconfdir}/pam.d
 install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/%{name}
 mkdir -p %{buildroot}%{_runstatedir}/%{name}
 rm -f %{buildroot}%{_datadir}/%{name}/themes/default/background.jpg
-#ln -s ../../../backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.png
-magick %{_datadir}/backgrounds/f%{?fedora}/default/f%{?fedora}-01-day.jxl %{buildroot}%{_datadir}/%{name}/themes/default/background.jpg
+#ln -s ../../../backgrounds/f%{bgver}/default/f%{bgver}-01-day.png
+magick %{_datadir}/backgrounds/f%{bgver}/default/f%{bgver}-01-day.jxl %{buildroot}%{_datadir}/%{name}/themes/default/background.jpg
 # install logrotate entry
 install -m0644 -D %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 

                 reply	other threads:[~2026-09-18 21:25 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=178976674943.1.13369992874470594412.rpms-slim-58c67a6f6811@fedoraproject.org \
    --to=adamwill@fedoraproject.org \
    --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