[kdebase-runtime] - use kde4's copy of khelpcenter.desktop

Rex Dieter rdieter at fedoraproject.org
Fri Oct 15 15:55:39 UTC 2010


commit 97d84c6c848d40d4c5c24efcbd9a17dd688d692b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 15 11:01:42 2010 -0500

    - use kde4's copy of khelpcenter.desktop

 kdebase-runtime.spec |   15 +++---
 khelpcenter.desktop  |  131 --------------------------------------------------
 2 files changed, 8 insertions(+), 138 deletions(-)
---
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index e3274be..6caafab 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.5.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -15,7 +15,6 @@ URL:           http://www.kde.org/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
-Source1:       khelpcenter.desktop
 
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
@@ -136,11 +135,10 @@ rm -f %{buildroot}%{_kde4_iconsdir}/hicolor/index.theme
 # people/countries' flags :-(
 %{!?flags:rm -f %{buildroot}%{_kde4_datadir}/locale/l10n/*/flag.png}
 
-# install this service for KDE 3 applications
-# NOTE: This is not a standard .desktop file, but an "almost standard" one
-#       installed into a KDE-3-specific directory, as usual for KDE 3 services,
-#       so we can't use desktop-file-install for it.
-install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
+# install this service for KDE 3 applications too
+mkdir %{buildroot}%{_datadir}/services
+ln -s %{_kde4_datadir}/kde4/services/khelpcenter.desktop \
+      %{buildroot}%{_datadir}/services/khelpcenter.desktop
 
 # installdbgsymbols script
 install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_fedora.sh \
@@ -238,6 +236,9 @@ fi
 
 
 %changelog
+* Fri Oct 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-2
+- use kde4's copy of khelpcenter.desktop
+
 * Fri Oct 01 2010 Rex Dieter <rdieter at fedoraproject.org> -  4.5.2-1
 - 4.5.2
 


More information about the scm-commits mailing list