[kde-runtime] 4.9.2-5

Rex Dieter rdieter at fedoraproject.org
Mon Oct 29 14:59:40 UTC 2012


commit 39ad4cde039dcbd04e61d389134273af6f5cd4af
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 29 09:59:44 2012 -0500

    4.9.2-5
    
    - -desktoptheme, -drkonqi, -kio-smb subpkgs (#855930)
    - drop hard Requires: htdig (#855930)
    - remove .spec cruft

 kde-runtime.spec |   96 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 78 insertions(+), 18 deletions(-)
---
diff --git a/kde-runtime.spec b/kde-runtime.spec
index 8313da6..625625f 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -6,7 +6,7 @@
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 4.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -18,7 +18,6 @@ URL:     http://www.kde.org/
 %global stable stable
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kde-runtime-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # add shortcuts for search provider
 Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
@@ -70,11 +69,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %if 0%{?flags}
 Requires: %{name}-flags = %{version}-%{release}
 %endif
-# KHelpcenter requires htdig for building search indices
-Requires: htdig
 Requires: nepomuk-core >= %{version}
-# patch51 uses pkexec
-Requires: polkit
 # Nepomuk requires pdftotext for indexing PDFs
 Requires: poppler-utils
 
@@ -130,12 +125,30 @@ Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 %{summary}.
 
+%package desktoptheme
+Summary: Plasma desktoptheme components
+Requires: %{name} = %{version}-%{release}
+# upgrade path
+Obsoletes: kde-runtime < 4.9.2-5
+BuildArch: noarch
+%description desktoptheme
+%{summary}, including icons and widgets.
+
+%package drkonqi
+Summary: DrKonqi KDE crash handler
+# upgrade path
+Obsoletes: kde-runtime < 4.9.2-5
+Requires: %{name} = %{version}-%{release}
+# drkonqi patch51 uses pkexec
+Requires: polkit
+%description drkonqi
+%{summary}.
+
 %package libs
 Summary: Runtime libraries for %{name}
 Obsoletes: kdebase-runtime-libs < 4.7.97-10
 Provides:  kdebase-runtime-libs = %{version}-%{release}
 Requires: kdelibs4%{?_isa} >= %{version}
-Requires: kdepimlibs%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
@@ -149,6 +162,14 @@ BuildArch: noarch
 %description flags
 %{summary}.
 
+%package kio-smb
+Summary: Samba KIO slave
+# upgrade path
+Obsoletes: kde-runtime < 4.9.2-5
+Requires: %{name} = %{version}-%{release}
+%description kio-smb
+%{summary}.
+
 
 %prep
 %setup -q -n kde-runtime-%{version}
@@ -165,6 +186,7 @@ BuildArch: noarch
 %patch300 -p1 -b .webkit
 %endif
 
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -180,8 +202,6 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf %{buildroot}
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # kdesu symlink
@@ -252,18 +272,39 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING COPYING.LIB
 %{_kde4_bindir}/*
-%{_kde4_appsdir}/*
-%exclude %{_kde4_appsdir}/cmake/
+%{_kde4_appsdir}/hardwarenotifications/
+%{_kde4_appsdir}/kcm_componentchooser/
+%{_kde4_appsdir}/kcmlocale/
+%{_kde4_appsdir}/kcm_phonon/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/kde/
+%{_kde4_appsdir}/kglobalaccel/
+%{_kde4_appsdir}/khelpcenter/
+%{_kde4_appsdir}/kio_bookmarks/
+%{_kde4_appsdir}/kio_desktop/
+%{_kde4_appsdir}/kio_docfilter/
+%{_kde4_appsdir}/kio_finger/
+%{_kde4_appsdir}/kio_info/
+%{_kde4_appsdir}/konqsidebartng/
+%{_kde4_appsdir}/ksmserver/
+%{_kde4_appsdir}/kwalletd/
+%{_kde4_appsdir}/libphonon/
+%{_kde4_appsdir}/phonon/
+%dir %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/remoteview/network.desktop
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/config.kcfg/*.kcfg
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/*.service
 %{_kde4_datadir}/autostart/nepomukcontroller.desktop
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%exclude %{_kde4_datadir}/kde4/services/smb.protocol
+%{_kde4_datadir}/kde4/services/kded/
+%{_kde4_datadir}/kde4/services/searchproviders/
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/mime/packages/network.xml
 %{_kde4_datadir}/sounds/*
@@ -273,8 +314,6 @@ fi
 %{_kde4_libdir}/kde4/platformimports/
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
-%{_kde4_libexecdir}/drkonqi
-%{_kde4_libexecdir}/installdbgsymbols.sh
 %{_kde4_libexecdir}/kcmremotewidgetshelper
 %{_kde4_libexecdir}/kdeeject
 %{_kde4_libexecdir}/kdesu
@@ -305,16 +344,22 @@ fi
 %{_polkit_qt_policydir}/*.policy
 %{_sysconfdir}/dbus-1/system.d/*
 
+%files desktoptheme
+%{_kde4_appsdir}/desktoptheme/
+
 %files devel
-%defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_appsdir}/cmake/modules/*.cmake
 
+%files drkonqi
+%{_kde4_libexecdir}/drkonqi
+%{_kde4_libexecdir}/installdbgsymbols.sh
+%{_kde4_appsdir}/drkonqi/
+
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%defattr(-,root,root,-)
 # unversioned plugin:
 %{_kde4_libdir}/attica_kde.so
 %{_kde4_libdir}/libknotifyplugin.so
@@ -329,12 +374,27 @@ fi
 
 %if 0%{?flags}
 %files flags
-%defattr(-,root,root,-)
 %{_kde4_datadir}/locale/l10n/*/flag.png
 %endif
 
+%files kio-smb
+%{_kde4_docdir}/HTML/en/kcontrol/smb/
+%{_kde4_docdir}/HTML/en/kioslave/smb/
+%dir %{_kde4_appsdir}/konqueror/dirtree/
+%dir %{_kde4_appsdir}/konqueror/dirtree/remote/
+%{_kde4_appsdir}/konqueror/dirtree/remote/smb-network.desktop
+%dir %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/remoteview/smb-network.desktop
+%{_kde4_datadir}/kde4/services/smb.protocol
+%{_kde4_libdir}/kde4/kio_smb.so
+
 
 %changelog
+* Mon Oct 29 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.2-5
+- -desktoptheme, -drkonqi, -kio-smb subpkgs (#855930)
+- drop hard Requires: htdig (#855930)
+- remove .spec cruft
+
 * Wed Oct 24 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-4
 - rebuild (libjpeg-turbo v8)
 


More information about the scm-commits mailing list