From 6b7fc570689cf8bf987e3ae3290f11c15de85178 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Mar 2017 12:30:03 -0600 Subject: [PATCH] fix sddm-breeze (01-breeze-fedora theme) bump kf5 dep --- .gitignore | 1 + plasma-workspace.spec | 23 ++++++++++++++--------- sources | 1 + sources.keep | 1 + 4 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 sources.keep diff --git a/.gitignore b/.gitignore index e6a1e7c..01f8c1d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /plasma-workspace-5.8.6.tar.xz /plasma-workspace-5.9.3.tar.xz +/breeze-fedora-1.0.tar.gz diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 78354dc..d3eda99 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,12 +2,12 @@ # repo or arch where there's no package that would provide plasmashell #define bootstrap 1 -%global kf5_version_min 5.26.0 +%global kf5_version_min 5.29.0 Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://cgit.kde.org/%{name}.git @@ -35,6 +35,10 @@ Source13: twenty.three.desktop Source14: twenty.four.desktop Source15: fedora.desktop +# breeze fedora sddm theme components +# includes f25-based preview (better than breeze or nothing at least) +Source20: breeze-fedora-1.0.tar.gz + ## downstream Patches Patch100: plasma-workspace-5.7.95-konsole-in-contextmenu.patch Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch @@ -434,7 +438,7 @@ BuildArch: noarch %prep -%setup -q +%setup -q -a 20 ## upstream patches @@ -532,17 +536,14 @@ install -m644 -p \ %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/components/artwork/background.png %endif -# make fedora-breeze sddm theme variant. FIXME/TODO: corrected preview screenshot +# make fedora-breeze sddm theme variant. cp -alf %{buildroot}%{_datadir}/sddm/themes/breeze/ \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora +# replace items ln -sf %{_datadir}/backgrounds/default.png \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/components/artwork/background.png -rm -fv %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf -cp -a %{buildroot}%{_datadir}/sddm/themes/breeze/theme.conf \ +install -m644 -p breeze-fedora/* \ %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/ -sed -i \ - -e "s|background=.*|background=/usr/share/backgrounds/default.png|" \ - %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf # Make kcheckpass work install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde @@ -734,6 +735,10 @@ fi %changelog +* Fri Mar 03 2017 Rex Dieter - 5.9.3-2 +- fix sddm-breeze (01-breeze-fedora theme) +- bump kf5 dep + * Wed Mar 01 2017 Jan Grulich - 5.9.3-1 - 5.9.3 diff --git a/sources b/sources index 2f0f201..ab2cd3b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (plasma-workspace-5.9.3.tar.xz) = 2b8f5281a683d5fac8bb8245997ff865054889cfbd467981530b6f329837b5e6f7b31cb506936a475bc640fb084fb11ec2eedc9a2189df238f6bee242ce782b6 +SHA512 (breeze-fedora-1.0.tar.gz) = ebfc7d66ba7042f2247a7dc679b8b9764c501f68b842a6b6a835b3cd990138f4881c09f8690c80c593c75a347adb2cae19f00a7ae5511cdf88d71544692b5d29 diff --git a/sources.keep b/sources.keep new file mode 100644 index 0000000..ab9de7e --- /dev/null +++ b/sources.keep @@ -0,0 +1 @@ +SHA512 (breeze-fedora-1.0.tar.gz) = ebfc7d66ba7042f2247a7dc679b8b9764c501f68b842a6b6a835b3cd990138f4881c09f8690c80c593c75a347adb2cae19f00a7ae5511cdf88d71544692b5d29