packages: kde4-kdebase-runtime/kde4-kdebase-runtime.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Thu Feb 18 00:32:25 CET 2010


Author: shadzik                      Date: Wed Feb 17 23:32:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdebase-runtime:
   kde4-kdebase-runtime.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec
diff -u packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.103 packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.104
--- packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.103	Sun Jan 31 03:19:56 2010
+++ packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec	Thu Feb 18 00:32:20 2010
@@ -6,49 +6,51 @@
 #
 %define		_state		stable
 %define		orgname		kdebase-runtime
-%define		qtver		4.5.3
+%define		qtver		4.6.1
 
 Summary:	KDE 4 base runtime components
 Summary(pl.UTF-8):	Komponenty uruchomieniowe podstawowej części KDE 4
 Name:		kde4-kdebase-runtime
-Version:	4.3.5
-Release:	1
+Version:	4.4.0
+Release:	5
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	2d49beb007c41c0bebac063a579e81d9
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5:	066f1de9029e237aaa75d40c3bb3fcd2
 Source1:	kdebase-searchproviders.tar.bz2
 # Source1-md5:	126c3524b5367f5096a628acbf9dc86f
 Source2:	l10n-iso639-1
 Patch100:	%{name}-branch.diff
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel
-BuildRequires:	Qt3Support-devel
+BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtOpenGL-devel >= %{qtver}
-BuildRequires:	QtScript-devel
+BuildRequires:	QtScript-devel >= %{qtver}
 BuildRequires:	QtSvg-devel >= %{qtver}
 BuildRequires:	QtTest-devel >= %{qtver}
-BuildRequires:	QtUiTools-devel
+BuildRequires:	QtUiTools-devel >= %{qtver}
 BuildRequires:	alsa-lib-devel
+BuildRequires:	attica-devel >= 0.1
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bzip2-devel
 BuildRequires:	clucene-core-devel >= 0.9.21
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
+BuildRequires:	exiv2-devel >= 0.18.2
 BuildRequires:	kde4-kdelibs-devel >= %{version}
-BuildRequires:	kde4-kdelibs-experimental-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libsmbclient-devel
+BuildRequires:	libssh-devel >= 1:0.4.0
 BuildRequires:	openslp-devel
-BuildRequires:	phonon-devel >= 4.3.1
+BuildRequires:	phonon-devel >= 4.3.80
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	soprano-devel >= 2.3.0
-BuildRequires:	strigi-devel >= 0.6.3
+BuildRequires:	shared-desktop-ontologies-devel >= 0.2
+BuildRequires:	soprano-devel >= 2.3.70
+BuildRequires:	strigi-devel >= 0.7.0
 BuildRequires:	xine-lib-devel
 BuildRequires:	xz-devel
 Provides:	dbus(org.freedesktop.Notifications)
@@ -100,7 +102,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version} -a1
-#%patch100 -p1
+%patch100 -p1
 
 %build
 install -d build
@@ -164,6 +166,7 @@
 %attr(755,root,root) %{_bindir}/kiconfinder
 %attr(755,root,root) %{_bindir}/khelpcenter
 %attr(755,root,root) %{_bindir}/khotnewstuff4
+%attr(755,root,root) %{_bindir}/khotnewstuff-upload
 %attr(755,root,root) %{_bindir}/kioclient
 %attr(755,root,root) %{_bindir}/kmimetypefinder
 %attr(755,root,root) %{_bindir}/knotify4
@@ -183,6 +186,7 @@
 %attr(755,root,root) %{_bindir}/nepomukserver
 %attr(755,root,root) %{_bindir}/nepomukservicestub
 %attr(755,root,root) %{_bindir}/plasmapkg
+%attr(755,root,root) %{_libdir}/attica_kde.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kcmshell4.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_khelpcenter.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kuiserver.so
@@ -195,6 +199,7 @@
 %attr(755,root,root) %ghost %{_libdir}/libmolletnetwork.so.?
 %attr(755,root,root) %{_libdir}/libmolletnetwork.so.4.*.*
 #
+%attr(755,root,root) %{_libdir}/kde4/comicbookthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/cursorthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/djvuthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/exrthumbnail.so
@@ -203,6 +208,7 @@
 %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
+%attr(755,root,root) %{_libdir}/kde4/kcm_device_automounter.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_emoticons.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_filetypes.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_icons.so
@@ -212,11 +218,13 @@
 %attr(755,root,root) %{_libdir}/kde4/kcm_locale.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_nepomuk.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_trash.so
+%attr(755,root,root) %{_libdir}/kde4/kded_device_automounter.so
 %attr(755,root,root) %{_libdir}/kde4/kded_kpasswdserver.so
 %attr(755,root,root) %{_libdir}/kde4/kded_ktimezoned.so
 %attr(755,root,root) %{_libdir}/kde4/kded_remotedirnotify.so
 %attr(755,root,root) %{_libdir}/kde4/kded_soliduiserver.so
 %attr(755,root,root) %{_libdir}/kde4/kded_desktopnotifier.so
+%attr(755,root,root) %{_libdir}/kde4/kded_nepomuksearchmodule.so
 %attr(755,root,root) %{_libdir}/kde4/kded_networkwatcher.so
 %attr(755,root,root) %{_libdir}/kde4/kded_solidautoeject.so
 %attr(755,root,root) %{_libdir}/kde4/kio_applications.so
@@ -239,9 +247,12 @@
 %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_thumbnail.so
+%attr(755,root,root) %{_libdir}/kde4/kio_timeline.so
 %attr(755,root,root) %{_libdir}/kde4/kio_trash.so
+%attr(755,root,root) %{_libdir}/kde4/kio_nepomuk.so
 %attr(755,root,root) %{_libdir}/kde4/libkmanpart.so
 %attr(755,root,root) %{_libdir}/kde4/fixhosturifilter.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_attica.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_phonon.so
 %attr(755,root,root) %{_libdir}/kde4/kcmspellchecking.so
 %attr(755,root,root) %{_libdir}/kde4/kshorturifilter.so
@@ -254,13 +265,19 @@
 %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_appletscript_simple_javascript.so
+%attr(755,root,root) %{_libdir}/kde4/plasma_dataenginescript_javascript.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_runnerscript_javascript.so
 %attr(755,root,root) %{_libdir}/kde4/svgthumbnail.so
 %attr(755,root,root) %{_libdir}/kde4/textthumbnail.so
+%attr(755,root,root) %{_libdir}/kde4/windowsexethumbnail.so
+%attr(755,root,root) %{_libdir}/kde4/windowsimagethumbnail.so
+
 %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
 %attr(755,root,root) %{_libdir}/kde4/libexec/kdesu
 %attr(755,root,root) %{_libdir}/kde4/libexec/kdesud
@@ -272,7 +289,7 @@
 %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_sopranobackend.so
+%attr(755,root,root) %{_libdir}/strigi/strigiindex_nepomukbackend.so
 %dir %{_libdir}/kde4/plugins/styles
 %{_datadir}/apps/drkonqi
 %dir %{_datadir}/apps/kcm_componentchooser
@@ -284,19 +301,21 @@
 %{_datadir}/apps/kcmlocale
 %{_datadir}/apps/kconf_update/kuriikwsfilter.upd
 %{_datadir}/apps/kde/kde.notifyrc
+%dir %{_datadir}/apps/kglobalaccel
+%{_datadir}/apps/kglobalaccel/kglobalaccel.notifyrc
 %{_datadir}/apps/khelpcenter
 %{_datadir}/apps/kio_bookmarks
 %{_datadir}/apps/kio_finger
 %{_datadir}/apps/kio_info
-%{_datadir}/apps/kio_thumbnail
+#%{_datadir}/apps/kio_thumbnail
 %dir %{_datadir}/apps/konqueror/dirtree
 %dir %{_datadir}/apps/konqueror/dirtree/remote
 %{_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/nepomuk
+#%dir %{_datadir}/apps/nepomuk/ontologies
+#%{_datadir}/apps/nepomuk/ontologies/*
 %dir %{_datadir}/apps/nepomukstorage
 %{_datadir}/apps/nepomukstorage/nepomukstorage.notifyrc
 %dir %{_datadir}/apps/nepomukstrigiservice
@@ -306,18 +325,22 @@
 %{_datadir}/config/icons.knsrc
 %{_datadir}/config/emoticons.knsrc
 %{_datadir}/config/kshorturifilterrc
+%{_datadir}/config/khotnewstuff_upload.knsrc
 %{_datadir}/dbus-1/services/org.kde.knotify.service
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/emoticons/kde4
 %{_datadir}/kde4/services/about.protocol
 %{_datadir}/kde4/services/applications.protocol
 %{_datadir}/kde4/services/ar.protocol
+%{_datadir}/kde4/services/kcm_attica.desktop
 %{_datadir}/kde4/services/bookmarks.protocol
 %{_datadir}/kde4/services/bzip.protocol
 %{_datadir}/kde4/services/bzip2.protocol
 %{_datadir}/kde4/services/cgi.protocol
+%{_datadir}/kde4/services/comicbookthumbnail.desktop
 %{_datadir}/kde4/services/componentchooser.desktop
 %{_datadir}/kde4/services/cursorthumbnail.desktop
+%{_datadir}/kde4/services/device_automounter_kcm.desktop
 %{_datadir}/kde4/services/djvuthumbnail.desktop
 %{_datadir}/kde4/services/emoticons.desktop
 %{_datadir}/kde4/services/exrthumbnail.desktop
@@ -336,8 +359,10 @@
 %{_datadir}/kde4/services/kcmkded.desktop
 %{_datadir}/kde4/services/kcmnotify.desktop
 %{_datadir}/kde4/services/kcmtrash.desktop
+%{_datadir}/kde4/services/kded/device_automounter.desktop
 %{_datadir}/kde4/services/kded/kpasswdserver.desktop
 %{_datadir}/kde4/services/kded/ktimezoned.desktop
+%{_datadir}/kde4/services/kded/nepomuksearchmodule.desktop
 %{_datadir}/kde4/services/kded/remotedirnotify.desktop
 %{_datadir}/kde4/services/kded/soliduiserver.desktop
 %{_datadir}/kde4/services/khelpcenter.desktop
@@ -352,6 +377,8 @@
 %{_datadir}/kde4/services/localdomainurifilter.desktop
 %{_datadir}/kde4/services/lzma.protocol
 %{_datadir}/kde4/services/man.protocol
+%{_datadir}/kde4/services/nepomuk.protocol
+%{_datadir}/kde4/services/nepomukremovablestorageservice.desktop
 %{_datadir}/kde4/services/nfs.protocol
 %{_datadir}/kde4/services/programs.protocol
 %{_datadir}/kde4/services/remote.protocol
@@ -365,6 +392,7 @@
 %{_datadir}/kde4/services/tar.protocol
 %{_datadir}/kde4/services/textthumbnail.desktop
 %{_datadir}/kde4/services/thumbnail.protocol
+%{_datadir}/kde4/services/timeline.protocol
 %{_datadir}/kde4/services/trash.protocol
 %{_datadir}/kde4/services/zip.protocol
 %{_datadir}/kde4/services/xz.protocol
@@ -386,7 +414,10 @@
 %{_datadir}/kde4/services/nepomukstorage.desktop
 %{_datadir}/kde4/services/nepomukstrigiservice.desktop
 %{_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/windowsexethumbnail.desktop
+%{_datadir}/kde4/services/windowsimagethumbnail.desktop
 %{_datadir}/kde4/servicetypes/nepomukservice.desktop
 %{_datadir}/kde4/servicetypes/searchprovider.desktop
 %{_datadir}/kde4/servicetypes/thumbcreator.desktop
@@ -417,6 +448,8 @@
 %{_datadir}/locale/l10n/southeurope.desktop
 %{_datadir}/locale/l10n/westafrica.desktop
 %{_datadir}/locale/l10n/westeurope.desktop
+# really?
+%{_datadir}/locale/currency
 
 %{_desktopdir}/kde4/Help.desktop
 %{_desktopdir}/kde4/knetattach.desktop
@@ -462,6 +495,14 @@
 # dir owned by kdelibs
 %{_datadir}/apps/desktoptheme/default/*
 
+# should this really be here? i mean, did kde mess up?
+%{_datadir}/apps/kstyle/themes/qtcde.themerc
+%{_datadir}/apps/kstyle/themes/qtcleanlooks.themerc
+%{_datadir}/apps/kstyle/themes/qtgtk.themerc
+%{_datadir}/apps/kstyle/themes/qtmotif.themerc
+%{_datadir}/apps/kstyle/themes/qtplastique.themerc
+%{_datadir}/apps/kstyle/themes/qtwindows.themerc
+
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libkwalletbackend.so
@@ -502,8 +543,7 @@
 %attr(755,root,root) %{_libdir}/kde4/plugins/styles/oxygen.so
 %{_datadir}/apps/kstyle/themes/oxygen.themerc
 %dir %{_datadir}/apps/desktoptheme/oxygen
-%dir %{_datadir}/apps/desktoptheme/oxygen/colors
-%{_datadir}/apps/desktoptheme/oxygen/metadata.desktop
+%{_datadir}/apps/desktoptheme/oxygen/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -511,46 +551,108 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.103  2010/01/31 02:19:56  sparky
+Revision 1.104  2010/02/17 23:32:20  shadzik
+- merged from DEVEL
+
+Revision 1.90.2.31  2010/02/17 20:29:01  arekm
+- rel 5; branch diff updated
+
+Revision 1.90.2.30  2010/02/12 07:39:45  arekm
+- rel 4; branch diff updated
+
+Revision 1.90.2.29  2010/02/08 15:11:58  arekm
+- rel 3; new tarball
+
+Revision 1.90.2.28  2010/02/05 18:03:42  arekm
+- rel 2; new tarball
+
+Revision 1.90.2.27  2010/02/04 20:21:59  arekm
+- up to 4.4.0
+
+Revision 1.90.2.26  2010/02/02 20:54:29  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.90.2.25  2010/02/02 15:59:17  shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.90.2.24  2010/02/02 15:45:03  shadzik
+- version qt4 BRs
+
+Revision 1.90.2.23  2010/02/02 13:10:32  shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.90.2.22  2010/01/31 23:42:28  shadzik
+- 4.4 RC3
+- files
+
+Revision 1.90.2.21  2010/01/31 02:21:18  sparky
 - BR: pkgconfig
 
-Revision 1.102  2010/01/28 21:41:42  shadzik
-- 4.3.5
+Revision 1.90.2.20  2010/01/20 08:30:36  arekm
+- up to 4.3.95
+
+Revision 1.90.2.19  2010/01/08 04:32:56  shadzik
+- 4.4 RC1
 
-Revision 1.101  2010/01/28 20:09:04  amateja
-- release 3
+Revision 1.90.2.18  2009/12/20 15:13:52  shadzik
+- 4.4 Beta2
 
-Revision 1.100  2010/01/15 23:43:51  hawk
-- release 2
+Revision 1.90.2.17  2009/12/04 14:31:12  shadzik
+- %files
 
-Revision 1.99  2009/12/03 23:48:10  sparky
+Revision 1.90.2.16  2009/12/04 14:09:51  shadzik
+- more BRs
+- rel 3
+
+Revision 1.90.2.15  2009/12/03 23:49:19  sparky
 - BR: OpenEXR-devel, Qt3Support-devel, QtScript-devel, QtUiTools-devel,
   alsa-lib-devel, bzip2-devel, libjpeg-devel, qt4-build, qt4-qmake, xz-devel
-- seems like something is still missing because OpenEXR and xine can't be detected
 
-Revision 1.98  2009/11/28 17:39:03  shadzik
-- 4.3.4
+Revision 1.90.2.14  2009/12/03 20:41:28  shadzik
+- updated BRs
+
+Revision 1.90.2.13  2009/12/03 20:19:38  shadzik
+- rel 2 to rebuild with new exiv2
+
+Revision 1.90.2.12  2009/12/03 15:38:12  shadzik
+- 4.4 beta1
+
+Revision 1.90.2.11  2009/11/17 23:13:56  shadzik
+- updated libssh BR
+- re-added kio_sftp
+- rel 2
+
+Revision 1.90.2.10  2009/11/17 22:51:47  shadzik
+- 4.3.75
+
+Revision 1.90.2.9  2009/10/28 23:57:51  shadzik
+- 4.3.73
+
+Revision 1.90.2.8  2009/10/20 20:10:29  shadzik
+- rel 2
 
-Revision 1.97  2009/11/25 09:47:08  arekm
-- rel 2; branch diff is back
+Revision 1.90.2.7  2009/10/20 19:57:38  shadzik
+- tak do chuja wafla. slon mi na ogon nadepnal!
 
-Revision 1.96  2009/10/31 13:17:10  shadzik
-- 4.3.3
+Revision 1.90.2.6  2009/10/18 15:45:50  paszczus
+- updated to 4.3.72
 
-Revision 1.95  2009/10/03 11:58:37  shadzik
-- updated qt BR
+Revision 1.90.2.5  2009/10/02 15:19:07  cactus
+- up to 4.3.69
+- BR: libssh-devel
+- kio slave sftp works again
 
-Revision 1.94  2009/10/02 17:54:16  shadzik
-- 4.3.2 try #1
+Revision 1.90.2.4  2009/09/23 00:28:27  cactus
+- up to 4.3.68
 
-Revision 1.93  2009/08/28 14:16:55  shadzik
-- 4.3.1
+Revision 1.90.2.3  2009/09/12 01:29:45  cactus
+- up to 4.3.67
 
-Revision 1.92  2009/08/25 20:28:15  shadzik
-- rel 4
+Revision 1.90.2.2  2009/08/25 09:44:56  cactus
+- up to 4.3.65
 
-Revision 1.91  2009/08/25 20:19:18  shadzik
-- apidocs no more (remainings from kde3)
+Revision 1.90.2.1  2009/08/20 12:52:14  cactus
+- up to 4.3.64
 
 Revision 1.90  2009/08/19 19:59:08  arekm
 - rel 3; branch diff is back
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec?r1=1.103&r2=1.104&f=u



More information about the pld-cvs-commit mailing list