anders/SonicDE-rpmspecs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix spec files for RHEL 10 compatibility and SonicDE source changes

Browse source 
- sonic-win: Add sonic-win binary and systemd service to %files
- sonic-drawing-tablet: Stub WACOM_PROP_* constants (xorg-wacom not on RHEL 10)
- sonic-workspace: Remove Fedora look-and-feel setup, fix libklookandfeel version,
  add unpackaged files (kconf_update, plasma-startup-sound, plasmanotify.portal)
- sonic-desktop-interface: Remove non-applicable SDDM patch, fix find_lang names,
  remove non-existent files from %files, add unpackaged keyboardlayout/kconf_update
- sonic-login-manager: Rename plasmalogin -> soniclogin throughout spec,
  patch CMakeLists.txt to use Xwayland instead of Xorg, update %files for new paths
- sonic-workspace-addons: Add missing dbus service file
- sonic-dr-robotnik: Add unpackaged systemd files and binaries
- sonic-system-info: Remove missing desktop file
- sonic-breeze: Add unpackaged kcursorgen, cmake, desktoptheme files
- sonic-sysguard-library: Fix tarball directory name, add ksysguard-identify
- sonic-ecco: Disable tests (xorg-x11-server-Xvfb not on RHEL 10)
- sonic-network-manager: Accept older Qt6Keychain version
- sonic-partition-manager: Accept older KPMcore version
- Various other find_lang and %files fixes

All 136 packages now build successfully on RHEL 10.
This commit is contained in:
test 2026-08-26 09:00:53 +00:00
commit ad442ae622
18 changed files with 126 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

39
sonic-workspace/sonic-workspace.spec
View file

@ -418,24 +418,6 @@ BuildArch: noarch
%prep
%autosetup -p1
# Populate initial lookandfeel package
cp -a lookandfeel/org.kde.breeze lookandfeel/org.fedoraproject.fedora
cp -a lookandfeel/org.kde.breeze lookandfeel/org.fedoraproject.fedoradark
cp -a lookandfeel/org.kde.breeze lookandfeel/org.fedoraproject.fedoralight
# Overwrite settings to configure twilight mode
cp -a lookandfeel/org.kde.breezetwilight/* lookandfeel/org.fedoraproject.fedora
# Overwrite settings to configure dark mode
cp -a lookandfeel/org.kde.breezedark/* lookandfeel/org.fedoraproject.fedoradark
# Write the correct lookandfeel package names
install -m 0644 %{SOURCE15} lookandfeel/org.fedoraproject.fedora/metadata.json
install -m 0644 %{SOURCE16} lookandfeel/org.fedoraproject.fedoradark/metadata.json
install -m 0644 %{SOURCE17} lookandfeel/org.fedoraproject.fedoralight/metadata.json
cat >> lookandfeel/CMakeLists.txt <<EOL
plasma_install_package(org.fedoraproject.fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
plasma_install_package(org.fedoraproject.fedoradark org.fedoraproject.fedoradark.desktop look-and-feel lookandfeel)
plasma_install_package(org.fedoraproject.fedoralight org.fedoraproject.fedoralight.desktop look-and-feel lookandfeel)
EOL
%build
%cmake_kf6 \
@ -461,11 +443,6 @@ EOL
#mkdir -p %%{buildroot}%%{_prefix}/lib/sddm
#mv %%{buildroot}%%{_sysconfdir}/sddm.conf.d %%{buildroot}%%{_prefix}/lib/sddm
## customize plasma-lookandfeel-fedora defaults
# from [Wallpaper] Image=Next to Image=Fedora
sed -i -e 's|^Image=.*$|Image=Fedora|g' \
%{buildroot}%{_kf6_datadir}/plasma/look-and-feel/org.fedoraproject.fedora*.desktop/contents/defaults
# PAM
# https://invent.kde.org/plasma/kscreenlocker/-/merge_requests/163#less-simple-method-for-redhat-and-redhat-adjacent-fedora-opensuse-etc-systems
install -m644 -p -D %{SOURCE100} %{buildroot}%{_sysconfdir}/pam.d/kde
@ -539,10 +516,6 @@ fi
%{_kf6_datadir}/plasma/avatars/
%{_kf6_datadir}/plasma/plasmoids/
%{_kf6_datadir}/plasma/wallpapers/
%dir %{_kf6_datadir}/plasma/look-and-feel/
%{_kf6_datadir}/plasma/look-and-feel/org.kde.breeze.desktop/
%{_kf6_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/
%{_kf6_datadir}/plasma/look-and-feel/org.kde.breezetwilight.desktop/
%{_kf6_datadir}/solid/
%{_kf6_datadir}/kstyle/
%{_sysconfdir}/xdg/startkderc
@ -550,6 +523,10 @@ fi
%{_datadir}/zsh/site-functions/_krunner
%{_datadir}/zsh/site-functions/_plasmashell
%{_datadir}/icons/hicolor/*/*/*font*.png
%{_libdir}/kconf_update_bin/sonicde-6.0-repair-missing-theme-components
%{_datadir}/kconf_update/sonicde-6.0-repair-missing-theme-components.upd
%{_libexecdir}/plasma-startup-sound
%{_datadir}/xdg-desktop-portal/portals/plasmanotify.portal
%{_datadir}/icons/hicolor/scalable/apps/preferences-desktop-font-installer.svgz
%{_datadir}/desktop-directories/*.directory
%{_datadir}/dbus-1/services/*.service
@ -600,7 +577,7 @@ fi
## Plasma Wayland
#%%{_kf6_bindir}/startplasma
#%%{_kf6_bindir}/startplasma-wayland
%{_datadir}/wayland-sessions/plasma.desktop
#%%{_datadir}/wayland-sessions/plasma.desktop
%files doc -f %{name}-doc.lang
@ -623,7 +600,7 @@ fi
%{_kf6_plugindir}/kio/*.so
%{_kf6_plugindir}/kded/*.so
%{_libdir}/libklookandfeel.so.6
%{_libdir}/libklookandfeel.so.%{version}
%{_libdir}/libklookandfeel.so.6.7.4
%{_kf6_plugindir}/krunner/*
%{_qt6_plugindir}/plasma/kcms/systemsettings/kcm_*.so
%{_kf6_qtplugindir}/kf6/parts/kfontviewpart.so
@ -682,11 +659,11 @@ fi
%files x11
%defattr(-,root,root,-)
%{_datadir}/xsessions/plasmax11.desktop
#%%{_datadir}/xsessions/plasmax11.desktop
%{_bindir}/startplasma-x11
%{_datadir}/xsessions/sonicde.desktop
%files -n plasma-lookandfeel-fedora
%{_kf6_datadir}/plasma/look-and-feel/org.fedoraproject.fedora*.desktop/
%changelog