[rpms/generic-logos] rawhide: Replace KDE 4 macros with KF6 ones

[rpms/generic-logos] rawhide: Replace KDE 4 macros with KF6 ones

[@ 2026-07-06 14:50 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/generic-logos
Branch : rawhide
Commit : 5d29c3d8904fdaee33b5f7fd456f5db765992fc1
Author : Timothée Ravier <tim@siosm.fr>
Date   : 2026-06-02T22:46:33+02:00
Stats  : +11/-11 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/generic-logos/c/5d29c3d8904fdaee33b5f7fd456f5db765992fc1?branch=rawhide

Log:
Replace KDE 4 macros with KF6 ones

---
diff --git a/generic-logos.spec b/generic-logos.spec
index dcd5b98..f3f1ff6 100644
--- a/generic-logos.spec
+++ b/generic-logos.spec
@@ -18,8 +18,8 @@ Conflicts:  anaconda-images <= 10
 Conflicts:  redhat-artwork <= 5.0.5
 BuildRequires: make
 BuildRequires: fdupes
-# For _kde4_* macros:
-BuildRequires: kde4-filesystem
+# For _kf6_datadir macro
+BuildRequires: kf6-rpm-macros
 # For generating the EFI icon
 BuildRequires: libicns-utils
 Requires(post): coreutils
@@ -81,8 +81,8 @@ for size in scalable ; do
   install -p -m 644 pixmaps/fedora-logo-sprite.svg %{buildroot}%{_datadir}/icons/hicolor/$size/apps/fedora-logo-icon.svg
 done
 
-mkdir -p %{buildroot}%{_kde4_iconsdir}/oxygen/48x48/apps/
-install -p -m 644 icons/Fedora/48x48/apps/* %{buildroot}%{_kde4_iconsdir}/oxygen/48x48/apps/
+mkdir -p %{buildroot}%{_kf6_datadir}/oxygen/48x48/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* %{buildroot}%{_kf6_datadir}/oxygen/48x48/apps/
 
 mkdir -p %{buildroot}%{_datadir}/plymouth/themes/charge/
 for i in plymouth/charge/* ; do
@@ -109,18 +109,18 @@ popd
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_kde4_iconsdir}/oxygen ||:
+touch --no-create %{_kf6_datadir}/oxygen ||:
 
 %postun
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_kde4_iconsdir}/oxygen ||:
+touch --no-create %{_kf6_datadir}/oxygen ||:
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   if [ -f %{_datadir}/icons/hicolor/index.theme ]; then
     gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
   fi
-  if [ -f %{_kde4_iconsdir}/Fedora-KDE/index.theme ]; then
-    gtk-update-icon-cache --quiet %{_kde4_iconsdir}/Fedora-KDE/index.theme || :
+  if [ -f %{_kf6_datadir}/Fedora-KDE/index.theme ]; then
+    gtk-update-icon-cache --quiet %{_kf6_datadir}/Fedora-KDE/index.theme || :
   fi
 fi
 fi
@@ -130,8 +130,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   if [ -f %{_datadir}/icons/Fedora/index.theme ]; then
     gtk-update-icon-cache --quiet %{_datadir}/icons/Fedora || :
   fi
-  if [ -f %{_kde4_iconsdir}/oxygen/index.theme ]; then
-    gtk-update-icon-cache --quiet %{_kde4_iconsdir}/oxygen/index.theme || :
+  if [ -f %{_kf6_datadir}/oxygen/index.theme ]; then
+    gtk-update-icon-cache --quiet %{_kf6_datadir}/oxygen/index.theme || :
   fi
 fi
 
@@ -147,7 +147,7 @@ fi
 %{_datadir}/pixmaps/*
 %exclude %{_datadir}/pixmaps/poweredby.png
 %{_datadir}/plymouth/themes/charge/*
-%{_kde4_iconsdir}/oxygen/
+%{_kf6_datadir}/oxygen/
 
 %files httpd
 %license COPYING