X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kde4-kdebase-runtime.spec;h=1ad2a73b1754775b49df0adfada872fa20afd10d;hb=e2d521be4d5e53eb9cad89a2fbd3d7dc0e9bbd8c;hp=6ee614869a9d597c39ea7caad952a00c2e3cb204;hpb=cd9975bf625f46e9a7b95f67e3550baca90b3470;p=packages%2Fkde4-kdebase-runtime.git

diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec
index 6ee6148..1ad2a73 100644
--- a/kde4-kdebase-runtime.spec
+++ b/kde4-kdebase-runtime.spec
@@ -2,47 +2,52 @@
 # - l10n != %lang glibc locales (et = etiopia not estonia!)
 #
 # Conditional build:
-#
+%bcond_with	ntrack	#  disabled due to https://bugs.launchpad.net/bugs/1115449
+
 %define		_state		stable
-%define		orgname		kdebase-runtime
-%define		qtver		4.7.1
+%define		orgname		kde-runtime
+%define		qtver		4.8.3
 %define		atticaver	0.2.0
 
 Summary:	KDE 4 base runtime components
 Summary(pl.UTF-8):	Komponenty uruchomieniowe podstawowej części KDE 4
 Name:		kde4-kdebase-runtime
-Version:	4.6.0
+Version:	4.10.4
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	1f9d6bc64d7b84a74dd3ab06615c71ce
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
+# Source0-md5:	979626f3f5f3b9fa69bab828cd1694e4
 Source1:	kdebase-searchproviders.tar.bz2
 # Source1-md5:	126c3524b5367f5096a628acbf9dc86f
 Source2:	l10n-iso639-1
+Source3:	battery.svgz
+# Source3-md5:	5e8154256c2941b74ed17b0bf18c753d
 Patch100:	%{name}-branch.diff
+Patch0:		%{name}-rpc.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel
-BuildRequires:	Qt3Support-devel >= %{qtver}
-BuildRequires:	QtDeclarative-devel >= %{qtver}
-BuildRequires:	QtOpenGL-devel >= %{qtver}
-BuildRequires:	QtScript-devel >= %{qtver}
-BuildRequires:	QtSvg-devel >= %{qtver}
-BuildRequires:	QtTest-devel >= %{qtver}
-BuildRequires:	QtUiTools-devel >= %{qtver}
 BuildRequires:	alsa-lib-devel
 BuildRequires:	attica-devel >= %{atticaver}
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bzip2-devel
 BuildRequires:	clucene-core-devel >= 0.9.21
 BuildRequires:	cmake >= 2.8.0
+BuildRequires:	docbook-dtd42-xml
+BuildRequires:	docbook-style-xsl
 BuildRequires:	exiv2-devel >= 0.18.2
+BuildRequires:	kde4-kactivities-devel >= %{version}
+BuildRequires:	kde4-nepomuk-core >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
+BuildRequires:	libcanberra-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	libqzeitgeist-devel >= 0.8
 BuildRequires:	libsmbclient-devel
 BuildRequires:	libssh-devel >= 1:0.4.0
-BuildRequires:	ntrack-devel
+BuildRequires:	libtirpc-devel
+BuildRequires:	kde4-nepomuk-core-devel
+%{?with_ntrack:BuildRequires:	ntrack-devel}
 BuildRequires:	openslp-devel
 BuildRequires:	phonon-devel >= 4.4.3
 BuildRequires:	pkgconfig
@@ -50,8 +55,9 @@ BuildRequires:	pulseaudio-devel
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.600
-BuildRequires:	shared-desktop-ontologies-devel >= 0.5
-BuildRequires:	soprano-devel >= 2.4.64
+BuildRequires:	shared-desktop-ontologies-devel >= 0.7.1
+BuildRequires:	shared-mime-info
+BuildRequires:	soprano-devel >= 2.6.51
 BuildRequires:	strigi-devel >= 0.7.0
 BuildRequires:	xine-lib-devel
 BuildRequires:	xz-devel
@@ -94,11 +100,13 @@ Wtyczki KDE 4 dla Phonona.
 %prep
 %setup -q -n %{orgname}-%{version} -a1
 #%patch100 -p1
+%patch0 -p1
 
 %build
 install -d build
 cd build
 %cmake \
+	%{!?with_ntrack:-DQNTRACK=BOOL:FALSE} \
 	-DLIBEXEC_INSTALL_DIR=%{_libdir}/kde4/libexec \
 	../
 
@@ -114,6 +122,12 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/kde4/services/searchproviders/pld
 cp -a kdebase-searchproviders/*.desktop $RPM_BUILD_ROOT%{_datadir}/kde4/services/searchproviders/pld
 
+%if "%{version}" > "4.11"
+echo "4.11 contains new battery so drop SOURCE3"
+exit 1
+%endif
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/apps/desktoptheme/default/icons/battery.svgz
+
 collect_l10n_files() {
 	while read country language comment; do
 		[ "$country" != "#" ] || continue
@@ -141,7 +155,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.files
 %defattr(644,root,root,755)
 %{_sysconfdir}/xdg/menus/kde-information.menu
-%attr(755,root,root) %{_bindir}/kactivitymanagerd
 %attr(755,root,root) %{_bindir}/kcmshell4
 %attr(755,root,root) %{_bindir}/kde-cp
 %attr(755,root,root) %{_bindir}/kde-mv
@@ -169,9 +182,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/kuiserver
 %attr(755,root,root) %{_bindir}/kwriteconfig
 %attr(755,root,root) %{_bindir}/solid-hardware
-%attr(755,root,root) %{_bindir}/nepomukbackup
-%attr(755,root,root) %{_bindir}/nepomukserver
-%attr(755,root,root) %{_bindir}/nepomukservicestub
+%attr(755,root,root) %{_bindir}/nepomukcontroller
+%attr(755,root,root) %{_bindir}/plasma-remote-helper
 %attr(755,root,root) %{_bindir}/plasmapkg
 %attr(755,root,root) %{_libdir}/attica_kde.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kcmshell4.so
@@ -179,11 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libkdeinit4_kuiserver.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kwalletd.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kglobalaccel.so
-%attr(755,root,root) %{_libdir}/libkdeinit4_nepomukserver.so
 %attr(755,root,root) %{_libdir}/libknotifyplugin.so
-%attr(755,root,root) %{_libdir}/libnepomukcommon.so
-%attr(755,root,root) %{_libdir}/libnepomuksync.so.?
-%attr(755,root,root) %{_libdir}/libnepomuksync.so.*.*.*
 # Is it ok to add those files to main package?
 %attr(755,root,root) %ghost %{_libdir}/libkwalletbackend.so.?
 %attr(755,root,root) %{_libdir}/libkwalletbackend.so.*.*.*
@@ -195,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/exrthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/htmlthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/imagethumbnail.so
-%attr(755,root,root) %{_libdir}/kde4/jpegrotatedthumbnail.so
+#%attr(755,root,root) %{_libdir}/kde4/jpegrotatedthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/jpegthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_cgi.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_componentchooser.so
@@ -219,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/kded_nepomuksearchmodule.so
 %attr(755,root,root) %{_libdir}/kde4/kded_networkstatus.so
 %attr(755,root,root) %{_libdir}/kde4/kded_networkwatcher.so
+%attr(755,root,root) %{_libdir}/kde4/kded_recentdocumentsnotifier.so
 %attr(755,root,root) %{_libdir}/kde4/kded_solidautoeject.so
 %attr(755,root,root) %{_libdir}/kde4/kio_applications.so
 %attr(755,root,root) %{_libdir}/kde4/kio_bookmarks.so
@@ -235,10 +244,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/kio_nepomuksearch.so
 %attr(755,root,root) %{_libdir}/kde4/kio_network.so
 %attr(755,root,root) %{_libdir}/kde4/kio_nfs.so
+%attr(755,root,root) %{_libdir}/kde4/kio_recentdocuments.so
 %attr(755,root,root) %{_libdir}/kde4/kio_remote.so
 %attr(755,root,root) %{_libdir}/kde4/kio_settings.so
 %attr(755,root,root) %{_libdir}/kde4/kio_sftp.so
 %attr(755,root,root) %{_libdir}/kde4/kio_smb.so
+%attr(755,root,root) %{_libdir}/kde4/kio_tags.so
 %attr(755,root,root) %{_libdir}/kde4/kio_thumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/kio_timeline.so
 %attr(755,root,root) %{_libdir}/kde4/kio_trash.so
@@ -254,15 +265,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/localdomainurifilter.so
 %attr(755,root,root) %{_libdir}/kde4/librenaudioplugin.so
 %attr(755,root,root) %{_libdir}/kde4/librenimageplugin.so
-#%attr(755,root,root) %{_libdir}/kde4/nepomukactivitiesservice.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukbackupsync.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukfilewatch.so
-#%attr(755,root,root) %{_libdir}/kde4/nepomukmigration1.so
-#%attr(755,root,root) %{_libdir}/kde4/nepomukontologyloader.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukqueryservice.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukremovablestorageservice.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukstorage.so
-%attr(755,root,root) %{_libdir}/kde4/nepomukstrigiservice.so
 %attr(755,root,root) %{_libdir}/kde4/plasma-kpart.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_appletscript_declarative.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_appletscript_simple_javascript.so
@@ -275,6 +277,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/windowsexethumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/windowsimagethumbnail.so
 
+%attr(755,root,root) %{_libdir}/kde4/imports
+
 %attr(755,root,root) %{_libdir}/kde4/libexec/drkonqi
 #%attr(755,root,root) %{_libdir}/kde4/libexec/installdbgsymbols.sh
 %attr(755,root,root) %{_libdir}/kde4/libexec/kdeeject
@@ -289,12 +293,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kde4/libexec/kioexec
 #%attr(755,root,root) %{_libdir}/kde4/libexec/klocaldomainurifilterhelper
 %attr(755,root,root) %{_libdir}/kde4/libexec/knetattach
-#%attr(755,root,root) %{_libdir}/strigi/strigiindex_nepomukbackend.so
 %attr(755,root,root) %{_libdir}/kde4/libexec/kcmremotewidgetshelper
+%{_libdir}/kde4/platformimports
 %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
-%{_desktopdir}/kde4/nepomukbackup.desktop
 %{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
 %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
+%{_desktopdir}/kde4/nepomukcontroller.desktop
 %{_datadir}/apps/drkonqi
 %dir %{_datadir}/apps/kcm_componentchooser
 %{_datadir}/apps/hardwarenotifications
@@ -318,14 +322,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop
 %dir %{_datadir}/apps/remoteview
 %{_datadir}/apps/remoteview/smb-network.desktop
-#%dir %{_datadir}/apps/nepomuk
-#%dir %{_datadir}/apps/nepomuk/ontologies
-#%{_datadir}/apps/nepomuk/ontologies/*
-%dir %{_datadir}/apps/nepomukstorage
-%{_datadir}/apps/nepomukstorage/nepomukstorage.notifyrc
-%dir %{_datadir}/apps/nepomukstrigiservice
-%{_datadir}/apps/nepomukstrigiservice/nepomukstrigiservice.notifyrc
 %{_datadir}/config.kcfg/khelpcenter.kcfg
+%{_datadir}/config.kcfg/jpegcreatorsettings.kcfg
 %{_datadir}/config/khotnewstuff.knsrc
 %{_datadir}/config/icons.knsrc
 %{_datadir}/config/emoticons.knsrc
@@ -357,17 +355,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/gzip.protocol
 %{_datadir}/kde4/services/htmlthumbnail.desktop
 %{_datadir}/kde4/services/icons.desktop
-%{_datadir}/kde4/services/jpegrotatedthumbnail.desktop
+#%{_datadir}/kde4/services/jpegrotatedthumbnail.desktop
 %{_datadir}/kde4/services/imagethumbnail.desktop
 %{_datadir}/kde4/services/info.protocol
 %{_datadir}/kde4/services/jpegthumbnail.desktop
-%{_datadir}/kde4/services/kactivitymanagerd.desktop
 %{_datadir}/kde4/services/kcm_kdnssd.desktop
 %{_datadir}/kde4/services/kcmcgi.desktop
 %{_datadir}/kde4/services/kcmkded.desktop
 %{_datadir}/kde4/services/kcmnotify.desktop
 %{_datadir}/kde4/services/kcmtrash.desktop
-%{_datadir}/kde4/services/kded/activitymanager.desktop
 %{_datadir}/kde4/services/kded/device_automounter.desktop
 %{_datadir}/kde4/services/kded/kpasswdserver.desktop
 %{_datadir}/kde4/services/kded/ktimezoned.desktop
@@ -388,9 +384,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/lzma.protocol
 %{_datadir}/kde4/services/man.protocol
 %{_datadir}/kde4/services/nepomuk.protocol
-%{_datadir}/kde4/services/nepomukactivitiesservice.desktop
-%{_datadir}/kde4/services/nepomukbackupsync.desktop
-%{_datadir}/kde4/services/nepomukremovablestorageservice.desktop
 %{_datadir}/kde4/services/nfs.protocol
 %{_datadir}/kde4/services/programs.protocol
 %{_datadir}/kde4/services/remote.protocol
@@ -401,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/sftp.protocol
 %{_datadir}/kde4/services/smb.protocol
 %{_datadir}/kde4/services/svgthumbnail.desktop
+%{_datadir}/kde4/services/tags.protocol
 %{_datadir}/kde4/services/tar.protocol
 %{_datadir}/kde4/services/textthumbnail.desktop
 %{_datadir}/kde4/services/thumbnail.protocol
@@ -415,16 +409,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/filetypes.desktop
 %{_datadir}/kde4/services/kded/networkwatcher.desktop
 %{_datadir}/kde4/services/kded/solidautoeject.desktop
+%{_datadir}/kde4/services/kded/recentdocumentsnotifier.desktop
 %{_datadir}/kde4/services/kglobalaccel.desktop
 %{_datadir}/kde4/services/network.protocol
 %{_datadir}/kde4/services/kcm_nepomuk.desktop
-%{_datadir}/kde4/services/nepomukfilewatch.desktop
-#%{_daetadir}/kde4/services/nepomukmigration1.desktop
-%{_datadir}/kde4/services/nepomukontologyloader.desktop
-%{_datadir}/kde4/services/nepomukqueryservice.desktop
 %{_datadir}/kde4/services/nepomuksearch.protocol
-%{_datadir}/kde4/services/nepomukstorage.desktop
-%{_datadir}/kde4/services/nepomukstrigiservice.desktop
 %{_datadir}/kde4/services/plasma-containment-newspaper.desktop
 %{_datadir}/kde4/services/plasma-kpart.desktop
 %{_datadir}/kde4/services/plasma-packagestructure-javascript-addon.desktop
@@ -432,16 +421,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
 %{_datadir}/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
 %{_datadir}/kde4/services/plasma-scriptengine-runner-javascript.desktop
+%{_datadir}/kde4/services/recentdocuments.protocol
 %{_datadir}/kde4/services/windowsexethumbnail.desktop
 %{_datadir}/kde4/services/windowsimagethumbnail.desktop
 %{_datadir}/kde4/servicetypes/knotifynotifymethod.desktop
-%{_datadir}/kde4/servicetypes/nepomukservice.desktop
 %{_datadir}/kde4/servicetypes/plasma-javascriptaddon.desktop
 %{_datadir}/kde4/servicetypes/searchprovider.desktop
 %{_datadir}/kde4/servicetypes/thumbcreator.desktop
 %{_datadir}/desktop-directories
 %{_datadir}/mime/packages/network.xml
-%{_datadir}/autostart/nepomukserver.desktop
+%{_datadir}/autostart/nepomukcontroller.desktop
 
 #%{_datadir}/locale/en_US/*
 %dir %{_datadir}/locale/l10n
@@ -491,8 +480,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(en) %{_kdedocdir}/en/kioslave/thumbnail
 %lang(en) %{_kdedocdir}/en/knetattach
 %lang(en) %{_kdedocdir}/en/network
-%lang(en) %{_mandir}/man1/kdesu.1*
-%lang(en) %{_mandir}/man8/nepomuk*.8*
+%{_mandir}/man1/kdesu.1*
+%{_mandir}/man1/plasmapkg.1*
+%{_mandir}/man8/nepomuk*.8*
 
 %{_datadir}/sounds/*
 %{_iconsdir}/hicolor/*/*/*.png
@@ -512,17 +502,14 @@ rm -rf $RPM_BUILD_ROOT
 
 # dir owned by kdelibs
 %{_datadir}/apps/desktoptheme/default/*
-%dir %{_datadir}/apps/desktoptheme/oxygen
-%{_datadir}/apps/desktoptheme/oxygen/*
-
+%{_datadir}/apps/desktoptheme/oxygen
+%{_datadir}/apps/desktoptheme/appdashboard
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/knotify*.h
-%{_includedir}/nepomuk
-%{_libdir}/libkwalletbackend.so
-%{_libdir}/libmolletnetwork.so
-%{_libdir}/libnepomuksync.so
+%attr(755,root,root) %{_libdir}/libkwalletbackend.so
+%attr(755,root,root) %{_libdir}/libmolletnetwork.so
 %{_datadir}/apps/cmake/modules/FindCLucene.cmake
 %{_datadir}/apps/cmake/modules/FindSLP.cmake
 
@@ -531,11 +518,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/kconf_update_bin/phonon_devicepreference_update
 %attr(755,root,root) %{_libdir}/kconf_update_bin/phonon_deviceuids_update
 %attr(755,root,root) %{_libdir}/kde4/kded_phononserver.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_phononxine.so
 %{_datadir}/kde4/services/kcm_phonon.desktop
 %{_datadir}/kde4/services/spellchecking.desktop
 %{_datadir}/kde4/servicetypes/phononbackend.desktop
-%{_datadir}/kde4/services/kcm_phononxine.desktop
 
 %dir %{_libdir}/kde4/plugins/phonon_platform
 %{_libdir}/kde4/plugins/phonon_platform/kde.so