rdieter pushed to kdelibs (f21). "fix build when disabling plasma_packagekit feature"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Apr 10 15:42:45 UTC 2015


>From c88f7f4469d97b8d019cb01ad4519c79b3b44d94 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 8 Mar 2015 14:05:01 -0500
Subject: fix build when disabling plasma_packagekit feature


diff --git a/kdelibs.spec b/kdelibs.spec
index a454a1c..bf3c5fa 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -27,6 +27,10 @@
 %define cmake_pkg cmake
 %define upower 1
 %endif
+# enable plasma/packagekit feature
+%if 0%{?fedora} < 22
+%define plasma_packagekit 1
+%endif
 # enable tests (disabled by default)
 #global tests 1
 
@@ -449,7 +453,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
 %patch091 -p1 -R -b .coding-style-fixes.patch
 %patch092 -p1 -R -b .return-application-icons-properly
-%if 0%{?fedora} < 22
+%if 0%{?plasma_packagekit}
 %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
 %endif
 
@@ -761,7 +765,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man1/preparetips.1*
 %{_kde4_bindir}/kconfig_compiler4
 %{_kde4_bindir}/makekdewidgets4
+%if 0%{?plasma_packagekit}
 %{_kde4_bindir}/plasma-dataengine-depextractor
+%endif
 %{_kde4_bindir}/kde4-doxygen.sh
 %{_kde4_appsdir}/cmake/
 %{_kde4_includedir}/*
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs.git/commit/?h=f21&id=c88f7f4469d97b8d019cb01ad4519c79b3b44d94


More information about the scm-commits mailing list