[kde-runtime] Don't provide kdesu on F22+ (provided by kde-cli-tools)
Daniel Vrátil
dvratil at fedoraproject.org
Thu Jan 29 12:39:54 UTC 2015
commit ebf73f3525039bc4dd6316c756f9e2cee16c468f
Author: Dan Vrátil <dvratil at redhat.com>
Date: Thu Jan 29 13:39:38 2015 +0100
Don't provide kdesu on F22+ (provided by kde-cli-tools)
kde-runtime.spec | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 9e7ad95..fa5a223 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -3,11 +3,10 @@
%define webkit 1
%endif
-#if 0%{?fedora} < 21 && 0%{?rhel}
-## provide /usr/bin/kdesu (or not)
-## kde-cli-tools will likely do this for f22+ -- rex
+if 0%{?fedora} <= 21 || 0%{?rhel}
+# provide /usr/bin/kdesu on F21- and RHEL, on F22+ kdesu is provided by kde-cli-tools
%define kdesu 1
-#endif
+endif
# enable nepomuk-compat stuff (or not), default off for now
#define nepomuk 1
@@ -15,7 +14,7 @@
Name: kde-runtime
Summary: KDE Runtime
Version: 14.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+ and GPLv2+
@@ -274,6 +273,9 @@ done
%if 0%{?kdesu}
# kdesu symlink
ln -s %{_kde4_libexecdir}/kdesu %{buildroot}%{_kde4_bindir}/kdesu
+%else
+# remove documentation
+rm -rf %{buildroot}/%{_kde4_docdir}/HTML/en/kdesu
%endif
# omit hicolor index.theme, use one from hicolor-icon-theme
@@ -504,6 +506,9 @@ fi
%{_kde4_datadir}/desktop-directories/kde-information.directory
%changelog
+* Thu Jan 29 2015 Daniel Vrátil <dvratil at redhat.com> 14.12.1-3
+- don't provide kdesu on F22+ (provided by kde-cli-tools)
+
* Tue Jan 20 2015 Rex Dieter <rdieter at fedoraproject.org> 14.12.1-2
- tarball respin
More information about the scm-commits
mailing list