public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/plasma-desktop] epel10.3: Merge branch f44 into epel10
@ 2026-09-14 17:07 Troy Dawson
  0 siblings, 0 replies; only message in thread
From: Troy Dawson @ 2026-09-14 17:07 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/plasma-desktop
Branch : epel10.3
Commit : 3c76bf39056927d101cc3159b5651ac75c8435e4
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-09-11T10:18:02-07:00
Stats  : +23/-4 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/plasma-desktop/c/3c76bf39056927d101cc3159b5651ac75c8435e4?branch=epel10.3

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index b3f2385..d6b53a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@
 /plasma-desktop-6.7.1.tar.xz.sig
 /plasma-desktop-6.7.2.tar.xz.sig
 /plasma-desktop-6.7.3.tar.xz.sig
+/plasma-desktop-6.7.4.tar.xz.sig
+/plasma-desktop-6.7.5.tar.xz.sig

diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 160bb40..4e2168f 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -5,7 +5,7 @@
 
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
-Version: 6.7.3
+Version: 6.7.5
 Release: 1%{?dist}
 
 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
@@ -375,6 +375,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 
 
 %changelog
+* Tue Sep 08 2026 Steve Cossette <farchord@gmail.com> - 6.7.5-1
+- 6.7.5
+
+* Tue Aug 04 2026 Steve Cossette <farchord@gmail.com> - 6.7.4-1
+- 6.7.4
+
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Tue Jul 14 2026 Steve Cossette <farchord@gmail.com> - 6.7.3-1
 - 6.7.3
 

diff --git a/sources b/sources
index 7a17c0e..c132100 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (breeze-fedora-0.3.tar.gz) = 8a3cafb61c5dc8944b71c8c8036e034d178a9384e0ca3b86847ad0caa91962b0f50e6615348cd32e116fe28a6befa5492dc5cc1c4ef0120617a1fbbf69ee0200
-SHA512 (plasma-desktop-6.7.3.tar.xz) = 0ee64b44181951cc19c296e2632da270db27d03b3dc462b53ba3512c066abc5085c0a6e71ac399094bde2daf39d290a7ad22e618b18810de1bd5347261230f03
-SHA512 (plasma-desktop-6.7.3.tar.xz.sig) = bd6b1c446c25173adfa9fdb6366ff4c188a29afb39aebb6e1d00eebd9549677f0ab459104768317d0ccf427ad2629cd62e1fd1bd19b59c6a62291de87e1dddc2
+SHA512 (plasma-desktop-6.7.5.tar.xz) = 8a6066ada7b4133a02d3c33913ff9e379a85f7c06b458422d718be0fa0a9283930b3457e1ab2a367664d56e6f9f260e51021197b647ade065f34017dd7bc4b55
+SHA512 (plasma-desktop-6.7.5.tar.xz.sig) = 853ab435e68f2b22a15d80855d1a402ce2595aa2ca6a52ef8c1e882e80b5ab9286f8c450ae076a9ddfb816ad2afa112cef8ad8a2803f7184e7de33caa6e5bbf6

diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 36e1d6d..4e2168f 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -116,6 +116,8 @@ BuildRequires:  pkgconfig(libwacom)
 
 BuildRequires:  xdg-user-dirs
 
+# RHEL10 has no xorg-x11-server or -drv, skip this part for now
+%if %[!(0%{?rhel} >= 10)]
 # xorg-x11 doesn't have hw_server and disable for s390/s390x
 %ifnarch s390 s390x
 # KCM touchpad has been merged to plasma-desktop in 5.3
@@ -134,6 +136,7 @@ BuildRequires:  pkgconfig(xorg-evdev)
 BuildRequires:  pkgconfig(xorg-libinput)
 
 %endif
+%endif
 
 # kcm_users
 Requires:       accountsservice
@@ -258,7 +261,7 @@ BuildArch: noarch
 
 %build
 %cmake_kf6 \
-%ifarch s390 s390x
+%if %[(0%{?rhel} >= 10)]
     -DBUILD_KCM_MOUSE_X11=OFF \
     -DBUILD_KCM_TOUCHPAD_X11=OFF
 %endif
@@ -320,11 +323,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 %{_kf6_qmldir}/org/kde/private/desktopcontainment/*
 %{_kf6_datadir}/plasma/*
 %{_kf6_datadir}/applications/kde-mimeapps.list
+%if %[!(0%{?rhel} >= 10)]
 %ifnarch s390 s390x
 # kcminput
 %{_kf6_bindir}/kapplymousetheme
 %{_kf6_bindir}/kcm-touchpad-list-devices
 %endif
+%endif
 %{_kf6_datadir}/kcmmouse/
 %{_kf6_qtplugindir}/plasma/kcminit/kcm_mouse_init.so
 %{_datadir}/config.kcfg/*.kcfg
@@ -559,6 +564,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kaccess.desktop
 * Tue Nov 05 2024 Steve Cossette <farchord@gmail.com> - 6.2.3-1
 - 6.2.3
 
+* Wed Oct 30 2024 Jan Grulich <jgrulich@redhat.com> - 6.2.2-2
+- Rebuild (qt6)
+
 * Tue Oct 22 2024 Steve Cossette <farchord@gmail.com> - 6.2.2-1
 - 6.2.2
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-14 17:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-14 17:07 [rpms/plasma-desktop] epel10.3: Merge branch f44 into epel10 Troy Dawson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox