public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-logos] rawhide: Replace KDE 4 macros with KF6 ones
Date: Tue, 02 Jun 2026 14:43:02 GMT [thread overview]
Message-ID: <178041138243.1.9789825600294439709.rpms-fedora-logos-d131450a0f01@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-logos
Branch : rawhide
Commit : d131450a0f011cb1512355c3e8eb416e2c1b041a
Author : Timothée Ravier <tim@siosm.fr>
Date : 2026-03-20T16:19:27+01:00
Stats : +12/-12 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-logos/c/d131450a0f011cb1512355c3e8eb416e2c1b041a?branch=rawhide
Log:
Replace KDE 4 macros with KF6 ones
---
diff --git a/fedora-logos.spec b/fedora-logos.spec
index d3f76c2..1ec1741 100644
--- a/fedora-logos.spec
+++ b/fedora-logos.spec
@@ -12,8 +12,8 @@ BuildArch: noarch
BuildRequires: hardlink
%if ! 0%{?eln}
-# For _kde4_* macros:
-BuildRequires: kde4-macros(api)
+# For _kf6_datadir macro
+BuildRequires: kf6-rpm-macros
%endif
%description
@@ -138,15 +138,15 @@ for i in 16 22 24 32 36 48 96 256 ; do
install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/places/start-here.png
install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon_classic.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/places/start-here_classic.png
%if ! 0%{?eln}
- install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/${i}x${i}/places/start-here-kde-fedora.png
- install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon_classic.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/${i}x${i}/places/start-here-kde-fedora_classic.png
+ install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon.png $RPM_BUILD_ROOT%{_kf6_datadir}/oxygen/${i}x${i}/places/start-here-kde-fedora.png
+ install -p -m 644 -D $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/fedora-logo-icon_classic.png $RPM_BUILD_ROOT%{_kf6_datadir}/oxygen/${i}x${i}/places/start-here-kde-fedora_classic.png
%endif
done
%if ! 0%{?eln}
-mkdir -p $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/
-install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/
-install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg $RPM_BUILD_ROOT%{_kde4_iconsdir}/oxygen/scalable/apps/
+mkdir -p $RPM_BUILD_ROOT%{_kf6_datadir}/oxygen/scalable/apps/
+install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller.svg $RPM_BUILD_ROOT%{_kf6_datadir}/oxygen/scalable/apps/
+install -p -m 644 icons/hicolor/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg $RPM_BUILD_ROOT%{_kf6_datadir}/oxygen/scalable/apps/
%endif
# Fedora favicon
@@ -244,9 +244,9 @@ hardlink -vv %{buildroot}/usr
%config(noreplace) %{_sysconfdir}/favicon.png
%{_datadir}/plymouth/themes/spinner/
%if ! 0%{?eln}
-%exclude %{_kde4_iconsdir}/oxygen/*/places/start-here-kde-fedora_classic.png
-%exclude %{_kde4_iconsdir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg
-%{_kde4_iconsdir}/oxygen/
+%exclude %{_kf6_datadir}/oxygen/*/places/start-here-kde-fedora_classic.png
+%exclude %{_kf6_datadir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg
+%{_kf6_datadir}/oxygen/
%endif
# in -classic
%exclude %{_datadir}/pixmaps/bootloader/fedora_classic.icns
@@ -346,8 +346,8 @@ hardlink -vv %{buildroot}/usr
%files classic
%license COPYING
%if ! 0%{?eln}
-%{_kde4_iconsdir}/oxygen/*/places/start-here-kde-fedora_classic.png
-%{_kde4_iconsdir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg
+%{_kf6_datadir}/oxygen/*/places/start-here-kde-fedora_classic.png
+%{_kf6_datadir}/oxygen/scalable/apps/org.fedoraproject.AnacondaInstaller_classic.svg
%endif
%{_sysconfdir}/favicon_classic.png
%{_datadir}/anaconda/pixmaps/*_classic*
reply other threads:[~2026-06-02 14:43 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=178041138243.1.9789825600294439709.rpms-fedora-logos-d131450a0f01@fedoraproject.org \
--to=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