rdieter pushed to plasma-workspace (master). "make l-a-f modifications f22+ only"

[notifications at fedoraproject.org]

From c0dedc6f482a4004571645356bcd46a7312dba9d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 19 May 2015 13:36:56 -0500
Subject: make l-a-f modifications f22+ only


diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index cce2ea3..6e111bc 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -199,7 +199,12 @@ Documentation and user manuals for %{name}.
 
 
 %prep
-%autosetup -p1
+%setup -q
+
+%patch10 -p1 -b .konsole-in-contextmenu
+%if 0%{?fedora} > 21
+%patch11 -p1 -b .set-fedora-default-look-and-feel
+%endif
 
 mv startkde/startkde.cmake startkde/startkde.cmake.orig
 install -m644 -p %{SOURCE11} startkde/startkde.cmake
@@ -222,13 +227,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 chrpath --delete %{buildroot}/%{_kf5_qtplugindir}/phonon_platform/kde.so
 
+%if 0%{?fedora} > 21
 # Create Fedora Twenty Two look and feel package from the Breeze one
 cp -r %{buildroot}/%{_datadir}/plasma/look-and-feel/{org.kde.breeze.desktop,org.fedoraproject.fedora.twenty.two}
 install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/metadata.desktop
 install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/kservices5/plasma-lookandfeel-org.fedoraproject.fedora.twenty.two.desktop
 ## We need to remove original background which will be replaced by Fedora one from f22-kde-theme
-rm -f %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/contents/components/artwork/background.png
-rm -f %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/contents/previews/{lockscreen.png,preview.png,splash.png}
+rm -fv %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/contents/components/artwork/background.png
+rm -fv %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/contents/previews/{lockscreen.png,preview.png,splash.png}
+%endif
 
 # Make kcheckpass work
 install -m455 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-workspace.git/commit/?h=master&id=c0dedc6f482a4004571645356bcd46a7312dba9d