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

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.179 
packages/kde4-kdelibs/kde4-kdelibs.spec:1.180
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.179       Thu Jan 28 22:09:57 2010
+++ packages/kde4-kdelibs/kde4-kdelibs.spec     Thu Feb 18 00:15:10 2010
@@ -1,15 +1,11 @@
 # $Revision$, $Date$
-# TODO
-# - use ca-certificates:
-#   rpm -qf /usr/share/apps/kssl/ca-bundle.crt
-#   kde4-kdelibs-4.3.3-1.x86_64
 #
 # Conditional build:
 %bcond_without kerberos5       # disable kerberos
 #
 %define                _state          stable
 %define                orgname         kdelibs
-%define                qtver           4.6.0
+%define                qtver           4.6.1
 
 Summary:       K Desktop Environment - libraries
 Summary(es.UTF-8):     K Desktop Environment - bibliotecas
@@ -19,13 +15,13 @@
 Summary(ru.UTF-8):     K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):     K Desktop Environment - Бібліотеки
 Name:          kde4-kdelibs
-Version:       4.3.5
-Release:       1
+Version:       4.4.0
+Release:       5
 License:       LGPL
 Group:         X11/Libraries
 Source0:       
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 8db761475eb6f03f634c388f1c05b329
-Patch100:      %{name}-branch.diff
+# Source0-md5: 957bca85de744a9ddd316fd85e882b40
+Patch100: %{name}-branch.diff
 Patch0:                %{orgname}4-findqt4.patch
 Patch1:                %{name}-findboost.patch
 Patch2:                %{name}-branding.patch
@@ -45,12 +41,13 @@
 BuildRequires: QtXml-devel >= %{qtver}
 BuildRequires: acl-devel
 BuildRequires: aspell-devel
+BuildRequires: attica-devel >= 0.1.1
 BuildRequires: audiofile-devel
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bison
 BuildRequires: bzip2-devel
-BuildRequires: cmake >= 2.6.3
+BuildRequires: cmake >= 2.8.0
 BuildRequires: cups-devel
 BuildRequires: enchant-devel
 BuildRequires: fam-devel
@@ -77,14 +74,17 @@
 BuildRequires: openmotif-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel >= 3.5
-BuildRequires: phonon-devel >= 4.3.1
+BuildRequires: phonon-devel >= 4.3.80
 BuildRequires: pkgconfig
+BuildRequires: polkit-qt-devel >= 0.9.3
+BuildRequires: qca-devel >= 2.0.0
 BuildRequires: qt4-build >= %{qtver}
 BuildRequires: qt4-qmake >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.293
+BuildRequires: shared-desktop-ontologies-devel >= 0.2
 BuildRequires: shared-mime-info >= 0.18
-BuildRequires: soprano-devel >= 2.3.1
-BuildRequires: strigi-devel >= 0.6.5
+BuildRequires: soprano-devel >= 2.3.70
+BuildRequires: strigi-devel >= 0.7.0
 BuildRequires: sysstat
 BuildRequires: utempter-devel
 BuildRequires: xz-devel
@@ -98,7 +98,9 @@
 Requires:      xdg-menus
 Requires:      xorg-app-iceauth
 Suggests:      kde4-icons
-Provides:      %{name}-shared
+Provides:      kde4-kdelibs-experimental
+Provides:      kde4-kdelibs-shared
+Obsoletes:     kde4-kdelibs-experimental
 Obsoletes:     kde4-kdelibs-libs
 Obsoletes:     kde4-kdelibs-shared
 Obsoletes:     kdelibs4
@@ -164,8 +166,8 @@
 Summary(ru.UTF-8):     Хедеры и документация для компилляции программ KDE
 Summary(uk.UTF-8):     Хедери та документація для компіляції програм KDE
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
 Requires:      QtOpenGL-devel >= %{qtver}
+Requires:      %{name} = %{version}-%{release}
 Requires:      acl-devel
 Requires:      fam-devel
 Requires:      libart_lgpl-devel
@@ -175,6 +177,7 @@
 Requires:      phonon-devel
 Requires:      xorg-lib-libXmu-devel
 Requires:      xorg-lib-libXt-devel
+Obsoletes:     kde4-kdelibs-experimental-devel
 Conflicts:     kdelibs-devel
 
 %description devel
@@ -198,7 +201,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p0
 #%patch0 -p0
 #%patch1 -p0
 %patch2 -p0
@@ -259,6 +262,8 @@
 %dir %{_docdir}/kde
 # from kde4-kdebase.spec - old common subpackage
 %dir %{_desktopdir}/kde4
+# DO NOT PACKAGE THIS FILE vvvv - use applnk
+#%{_sysconfdir}/xdg/menus/applications.menu
 %attr(755,root,root) %{_bindir}/kjs
 %attr(755,root,root) %{_bindir}/kbuildsycoca4
 %attr(755,root,root) %{_bindir}/kcookiejar4
@@ -272,11 +277,11 @@
 %attr(755,root,root) %{_bindir}/kshell4
 %attr(755,root,root) %{_bindir}/kwrapper4
 %attr(755,root,root) %{_bindir}/meinproc4
+%attr(755,root,root) %{_bindir}/nepomuk-rcgen
 %attr(755,root,root) %{_bindir}/preparetips
 %attr(755,root,root) %{_bindir}/checkXML
 %attr(755,root,root) %{_bindir}/kunittestmodrunner
 %attr(755,root,root) %{_bindir}/makekdewidgets
-%attr(755,root,root) %{_bindir}/nepomuk-rcgen
 %{_kdedocdir}/en/sonnet
 %{_mandir}/man1/kde4-config.1*
 %{_mandir}/man1/kdecmake.1*
@@ -308,6 +313,7 @@
 # %{_datadir}/apps/ktexteditor_docwordcompletion
 %{_datadir}/apps/ktexteditor_insertfile
 %{_datadir}/apps/ktexteditor_kdatatool
+%{_datadir}/apps/ktexteditor_exporter
 %{_datadir}/apps/proxyscout
 %{_datadir}/apps/kcharselect
 %{_datadir}/apps/knewstuff
@@ -336,10 +342,25 @@
 
 %{_datadir}/dbus-1/interfaces/*.xml
 
+# kcmremotewidgets
+/etc/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
+%{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmremotewidgets.service
+%{_datadir}/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
+
+# kauth
+%{_datadir}/apps/kauth
+/etc/dbus-1/system.d/org.kde.auth.conf
+
+%dir %{_datadir}/apps/plasma
+%dir %{_datadir}/apps/plasma/services
+%{_datadir}/apps/plasma/services/dataengineservice.operations
+%{_datadir}/apps/plasma/services/plasmoidservice.operations
+
 %{_datadir}/apps/katepart
 %{_datadir}/apps/kcm_componentchooser
 %{_datadir}/apps/kdeui
 %{_datadir}/apps/kdewidgets
+%{_datadir}/apps/nepomuk
 %dir %{_datadir}/apps/khtml
 %dir %{_datadir}/apps/khtml/css
 %{_datadir}/apps/khtml/css/html4.css
@@ -349,7 +370,6 @@
 %{_datadir}/apps/kjava/kjava.jar
 %{_datadir}/apps/ksgmltools2
 %{_datadir}/apps/kssl
-%{_datadir}/apps/nepomuk
 %dir %{_datadir}/config
 %dir %{_datadir}/config/ui
 %{_datadir}/config/ui/ui_standards.rc
@@ -361,39 +381,76 @@
 %lang(en) %{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kioslave
 
-%attr(755,root,root) %{_libdir}/libkde3support.so.*
-%attr(755,root,root) %{_libdir}/libkdecore.so.*
-%attr(755,root,root) %{_libdir}/libkdefakes.so.*
-%attr(755,root,root) %{_libdir}/libkdesu.so.*
-%attr(755,root,root) %{_libdir}/libplasma.so.*
-%attr(755,root,root) %{_libdir}/libkpty.so.*
-%attr(755,root,root) %{_libdir}/libkdeui.so.*
-%attr(755,root,root) %{_libdir}/libkdnssd.so.*
-%attr(755,root,root) %{_libdir}/libkhtml.so.*
-%attr(755,root,root) %{_libdir}/libkimproxy.so.*
-%attr(755,root,root) %{_libdir}/libkio.so.*
-%attr(755,root,root) %{_libdir}/libkjs.so.*
-%attr(755,root,root) %{_libdir}/libkjsapi.so.*
-%attr(755,root,root) %{_libdir}/libkjsembed.so.*
-%attr(755,root,root) %{_libdir}/libkmediaplayer.so.*
-%attr(755,root,root) %{_libdir}/libknewstuff2.so.*
-%attr(755,root,root) %{_libdir}/libknotifyconfig.so.*
-%attr(755,root,root) %{_libdir}/libkntlm.so.*
-%attr(755,root,root) %{_libdir}/libkparts.so.*
-%attr(755,root,root) %{_libdir}/libktexteditor.so.*
-%attr(755,root,root) %{_libdir}/libkunittest.so.*
-%attr(755,root,root) %{_libdir}/libkutils.so.*
-%attr(755,root,root) %{_libdir}/libsolid.so.*
-%attr(755,root,root) %{_libdir}/libthreadweaver.so.*
-%attr(755,root,root) %{_libdir}/libkfile.so.*
-%attr(755,root,root) %{_libdir}/libkrosscore.so.*
-%attr(755,root,root) %{_libdir}/libkrossui.so.*
+%attr(755,root,root) %{_libdir}/libkde3support.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkde3support.so.?
+%attr(755,root,root) %{_libdir}/libkdecore.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdecore.so.?
+%attr(755,root,root) %{_libdir}/libkdefakes.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdefakes.so.?
+%attr(755,root,root) %{_libdir}/libkdesu.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdesu.so.?
+%attr(755,root,root) %{_libdir}/libkdeui.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeui.so.?
+%attr(755,root,root) %{_libdir}/libkdnssd.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdnssd.so.?
+%attr(755,root,root) %{_libdir}/libkfile.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkfile.so.?
+%attr(755,root,root) %{_libdir}/libkhtml.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkhtml.so.?
+%attr(755,root,root) %{_libdir}/libkimproxy.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkimproxy.so.?
+%attr(755,root,root) %{_libdir}/libkio.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkio.so.?
+%attr(755,root,root) %{_libdir}/libkjs.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjs.so.?
+%attr(755,root,root) %{_libdir}/libkjsapi.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjsapi.so.?
+%attr(755,root,root) %{_libdir}/libkjsembed.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkjsembed.so.?
+%attr(755,root,root) %{_libdir}/libkmediaplayer.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmediaplayer.so.?
+%attr(755,root,root) %{_libdir}/libknewstuff2.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libknewstuff2.so.?
+%attr(755,root,root) %{_libdir}/libknewstuff3.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libknewstuff3.so.?
+%attr(755,root,root) %{_libdir}/libknotifyconfig.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libknotifyconfig.so.?
+%attr(755,root,root) %{_libdir}/libkntlm.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkntlm.so.?
+%attr(755,root,root) %{_libdir}/libkparts.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkparts.so.?
+%attr(755,root,root) %{_libdir}/libkpty.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkpty.so.?
+%attr(755,root,root) %{_libdir}/libkrosscore.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkrosscore.so.?
+%attr(755,root,root) %{_libdir}/libkrossui.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkrossui.so.?
+%attr(755,root,root) %{_libdir}/libktexteditor.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libktexteditor.so.?
+%attr(755,root,root) %{_libdir}/libkunitconversion.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkunitconversion.so.?
+%attr(755,root,root) %{_libdir}/libkunittest.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkunittest.so.?
+%attr(755,root,root) %{_libdir}/libkutils.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkutils.so.?
+%attr(755,root,root) %{_libdir}/libnepomuk.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnepomuk.so.?
+%attr(755,root,root) %{_libdir}/libnepomukquery.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnepomukquery.so.?
+%attr(755,root,root) %{_libdir}/libplasma.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libplasma.so.?
+%attr(755,root,root) %{_libdir}/libsolid.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsolid.so.?
+%attr(755,root,root) %{_libdir}/libthreadweaver.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libthreadweaver.so.?
+%attr(755,root,root) %{_libdir}/libkdewebkit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdewebkit.so.?
+
 %attr(755,root,root) %{_libdir}/libkdeinit4_kbuildsycoca4.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kded4.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kconf_update.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_kio_http_cache_cleaner.so
 %attr(755,root,root) %{_libdir}/libkdeinit4_klauncher.so
-%attr(755,root,root) %{_libdir}/libnepomuk.so.*
 
 %attr(755,root,root) %{_libdir}/kde4/*.so
 %dir %{_libdir}/kde4/plugins/designer
@@ -415,10 +472,10 @@
 %attr(755,root,root) %{_libdir}/libkde3support.so
 %attr(755,root,root) %{_libdir}/libkdecore.so
 %attr(755,root,root) %{_libdir}/libkdefakes.so
-%attr(755,root,root) %{_libdir}/libkpty.so
 %attr(755,root,root) %{_libdir}/libkdesu.so
 %attr(755,root,root) %{_libdir}/libkdeui.so
 %attr(755,root,root) %{_libdir}/libkdnssd.so
+%attr(755,root,root) %{_libdir}/libkfile.so
 %attr(755,root,root) %{_libdir}/libkhtml.so
 %attr(755,root,root) %{_libdir}/libkimproxy.so
 %attr(755,root,root) %{_libdir}/libkio.so
@@ -426,20 +483,25 @@
 %attr(755,root,root) %{_libdir}/libkjsapi.so
 %attr(755,root,root) %{_libdir}/libkjsembed.so
 %attr(755,root,root) %{_libdir}/libkmediaplayer.so
+%attr(755,root,root) %{_libdir}/libknewstuff2.so
+%attr(755,root,root) %{_libdir}/libknewstuff3.so
 %attr(755,root,root) %{_libdir}/libknotifyconfig.so
 %attr(755,root,root) %{_libdir}/libkntlm.so
 %attr(755,root,root) %{_libdir}/libkparts.so
+%attr(755,root,root) %{_libdir}/libkpty.so
+%attr(755,root,root) %{_libdir}/libkrosscore.so
+%attr(755,root,root) %{_libdir}/libkrossui.so
 %attr(755,root,root) %{_libdir}/libktexteditor.so
+%attr(755,root,root) %{_libdir}/libkunitconversion.so
 %attr(755,root,root) %{_libdir}/libkunittest.so
 %attr(755,root,root) %{_libdir}/libkutils.so
-%attr(755,root,root) %{_libdir}/libsolid.so
-%attr(755,root,root) %{_libdir}/libthreadweaver.so
-%attr(755,root,root) %{_libdir}/libkfile.so
 %attr(755,root,root) %{_libdir}/libnepomuk.so
-%attr(755,root,root) %{_libdir}/libknewstuff2.so
-%attr(755,root,root) %{_libdir}/libkrosscore.so
-%attr(755,root,root) %{_libdir}/libkrossui.so
+%attr(755,root,root) %{_libdir}/libnepomukquery.so
 %attr(755,root,root) %{_libdir}/libplasma.so
+%attr(755,root,root) %{_libdir}/libsolid.so
+%attr(755,root,root) %{_libdir}/libthreadweaver.so
+%attr(755,root,root) %{_libdir}/libkdewebkit.so
+
 %{_datadir}/apps/cmake
 %{_includedir}/KDE/ConversionCheck
 %{_includedir}/KDE/DNSSD
@@ -519,6 +581,7 @@
 %{_includedir}/KDE/KArchiveFile
 %{_includedir}/KDE/KArrowButton
 %{_includedir}/KDE/KAssistantDialog
+%{_includedir}/KDE/KAuth
 %{_includedir}/KDE/KAuthorized
 %{_includedir}/KDE/KAutoMount
 %{_includedir}/KDE/KAutoUnmount
@@ -527,6 +590,7 @@
 %{_includedir}/KDE/KBookmarkAction
 %{_includedir}/KDE/KBookmarkActionInterface
 %{_includedir}/KDE/KBookmarkActionMenu
+%{_includedir}/KDE/KBookmarkDialog
 %{_includedir}/KDE/KBookmarkDomBuilder
 %{_includedir}/KDE/KBookmarkExporterBase
 %{_includedir}/KDE/KBookmarkGroup
@@ -604,6 +668,7 @@
 %{_includedir}/KDE/KDialogButtonBox
 %{_includedir}/KDE/KDirLister
 %{_includedir}/KDE/KDirModel
+%{_includedir}/KDE/KDirNotify
 %{_includedir}/KDE/KDirOperator
 %{_includedir}/KDE/KDirSelectDialog
 %{_includedir}/KDE/KDirSortFilterProxyModel
@@ -611,7 +676,6 @@
 %{_includedir}/KDE/KDiskFreeSpace
 %{_includedir}/KDE/KDiskFreeSpaceInfo
 %{_includedir}/KDE/KDoubleNumInput
-%{_includedir}/KDE/KDoubleSpinBox
 %{_includedir}/KDE/KDoubleValidator
 %{_includedir}/KDE/KEMailSettings
 %{_includedir}/KDE/KEditListBox
@@ -658,6 +722,7 @@
 %{_includedir}/KDE/KGlobalAccel
 %{_includedir}/KDE/KGlobalSettings
 %{_includedir}/KDE/KGradientSelector
+%{_includedir}/KDE/KGraphicsWebView
 %{_includedir}/KDE/KGuiItem
 %{_includedir}/KDE/KHBox
 %{_includedir}/KDE/KHE
@@ -722,6 +787,7 @@
 %{_includedir}/KDE/KMultiTabBarButton
 %{_includedir}/KDE/KMultiTabBarTab
 %{_includedir}/KDE/KNFSShare
+%{_includedir}/KDE/KNS3
 %{_includedir}/KDE/KNS
 %{_includedir}/KDE/KNSBookmarkExporter
 %{_includedir}/KDE/KNSBookmarkExporterImpl
@@ -753,6 +819,9 @@
 %{_includedir}/KDE/KPixmapProvider
 %{_includedir}/KDE/KPixmapRegionSelectorDialog
 %{_includedir}/KDE/KPixmapRegionSelectorWidget
+%{_includedir}/KDE/KPixmapSequence
+%{_includedir}/KDE/KPixmapSequenceOverlayPainter
+#%{_includedir}/KDE/KPixmapSequenceOverlayWidget
 %{_includedir}/KDE/KPlotAxis
 %{_includedir}/KDE/KPlotObject
 %{_includedir}/KDE/KPlotPoint
@@ -822,6 +891,7 @@
 %{_includedir}/KDE/KStartupInfoData
 %{_includedir}/KDE/KStartupInfoId
 %{_includedir}/KDE/KStatusBar
+%{_includedir}/KDE/KStatusNotifierItem
 %{_includedir}/KDE/KStringHandler
 %{_includedir}/KDE/KStringListValidator
 %{_includedir}/KDE/KStyle
@@ -866,6 +936,7 @@
 %{_includedir}/KDE/KTzfileTimeZoneSource
 %{_includedir}/KDE/KUndoStack
 %{_includedir}/KDE/KUniqueApplication
+%{_includedir}/KDE/KUnitConversion
 %{_includedir}/KDE/KUnitTest
 %{_includedir}/KDE/KUriFilter
 %{_includedir}/KDE/KUriFilterData
@@ -883,6 +954,9 @@
 %{_includedir}/KDE/KUserGroup
 %{_includedir}/KDE/KVBox
 %{_includedir}/KDE/KWallet
+%{_includedir}/KDE/KWebPage
+%{_includedir}/KDE/KWebPluginFactory
+%{_includedir}/KDE/KWebView
 %{_includedir}/KDE/KWidgetItemDelegate
 %{_includedir}/KDE/KWindowInfo
 %{_includedir}/KDE/KWindowSystem
@@ -901,6 +975,7 @@
 %{_includedir}/KDE/KZoneAllocator
 %{_includedir}/KDE/KonqBookmarkMenu
 %{_includedir}/KDE/KonqBookmarkOwner
+%{_includedir}/KDE/Kross
 %{_includedir}/KDE/NET
 %{_includedir}/KDE/NETRootInfo
 %{_includedir}/KDE/NETWinInfo
@@ -919,8 +994,6 @@
 %{_includedir}/KDE/khtml
 %{_includedir}/KDE/kndbgstream
 %{_includedir}/KDE/Plasma
-%dir %{_includedir}/nepomuk
-%{_includedir}/nepomuk/*
 %dir %{_includedir}/plasma
 %{_includedir}/plasma/*
 %dir %{_includedir}/dnssd
@@ -938,12 +1011,14 @@
 %dir %{_includedir}/kmediaplayer
 %{_includedir}/kmediaplayer/*
 %{_includedir}/knewstuff2
+%{_includedir}/knewstuff3
 %dir %{_includedir}/kparts
 %{_includedir}/kparts/*
 %{_includedir}/kross
 %dir %{_includedir}/ktexteditor
 %{_includedir}/ktexteditor/*
-%{_includedir}/*.h
+%dir %{_includedir}/nepomuk
+%{_includedir}/nepomuk/*
 %dir %{_includedir}/solid
 %{_includedir}/solid/*
 %dir %{_includedir}/sonnet
@@ -953,8 +1028,11 @@
 %{_includedir}/*.tcc
 %dir %{_includedir}/ksettings
 %{_includedir}/ksettings/*
+%dir %{_includedir}/kunitconversion
+%{_includedir}/kunitconversion/*
 %dir %{_includedir}/kunittest
 %{_includedir}/kunittest/*
+%{_includedir}/*.h
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -962,75 +1040,133 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.179  2010/01/28 21:09:57  shadzik
-- 4.3.5
+Revision 1.180  2010/02/17 23:15:10  shadzik
+- merged from DEVEL
 
-Revision 1.178  2010/01/28 20:44:15  arekm
-- release 5
+Revision 1.157.2.40  2010/02/12 18:18:35  arekm
+- rel 5; branch diff update; scrolling fix for konqueror
 
-Revision 1.177  2009/12/21 09:36:38  arekm
-- rel 4; force qt 4.6.0
+Revision 1.157.2.39  2010/02/12 07:32:03  arekm
+- rel 4; branch diff is back
 
-Revision 1.176  2009/12/03 22:37:39  sparky
-- BR: bison, flex
+Revision 1.157.2.38  2010/02/09 14:26:45  arekm
+- rel 3; new tarball
+
+Revision 1.157.2.37  2010/02/08 21:19:33  arekm
+- rel 2; new tarball
+
+Revision 1.157.2.36  2010/02/04 19:22:21  arekm
+- up to 4.4.0
+
+Revision 1.157.2.35  2010/02/02 20:55:23  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest 
qtver
+
+Revision 1.157.2.34  2010/02/02 16:00:25  shadzik
+- minor clean up (removing old svn snap stuff)
+
+Revision 1.157.2.33  2010/02/02 13:11:27  shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.157.2.32  2010/02/02 12:47:44  shadzik
+- R: QtOpenGL-devel >= %{qtver} in -devel
+
+Revision 1.157.2.31  2010/01/31 22:21:21  arekm
+- up to 4.3.98
+
+Revision 1.157.2.30  2010/01/20 09:20:11  arekm
+- add BR: QtOpenGL-devel
 
-Revision 1.175  2009/12/02 18:12:41  arekm
-- rel 3; branch diff is back
+Revision 1.157.2.29  2010/01/20 07:57:31  arekm
+- up 4.3.95
 
-Revision 1.174  2009/12/01 00:36:52  shadzik
+Revision 1.157.2.28  2010/01/08 09:49:59  arekm
+add BR polkit-qt-devel >= 0.9.3; shared-desktop-ontologies-devel is needed
+
+Revision 1.157.2.27  2010/01/06 20:59:36  shadzik
+- 4.4 RC1
+
+Revision 1.157.2.26  2009/12/20 12:35:35  shadzik
+- 4.4 Beta2
+
+Revision 1.157.2.25  2009/12/04 01:08:59  shadzik
 - new tarball
+- rel 3
+
+Revision 1.157.2.24  2009/12/03 22:38:23  sparky
+- BR: bison, flex
+
+Revision 1.157.2.23  2009/12/03 22:02:03  shadzik
+- add -findqt4.patch
 - rel 2
 
-Revision 1.173  2009/11/28 17:06:47  shadzik
-- 4.3.4 try#1
+Revision 1.157.2.22  2009/12/03 20:39:34  shadzik
+- updated BRs
 
-Revision 1.172  2009/11/25 09:41:47  arekm
-- rel 2; branch diff updated
+Revision 1.157.2.21  2009/12/02 21:03:24  cactus
+- files
 
-Revision 1.171  2009/11/08 13:15:33  glen
-- todo for using global ssl certs
+Revision 1.157.2.20  2009/12/02 18:34:13  shadzik
+- raw; files need to be fixed, don't touch this! :)
 
-Revision 1.170  2009/10/31 13:02:58  shadzik
-- 4.3.3
+Revision 1.157.2.19  2009/12/01 19:39:52  shadzik
+- again
 
-Revision 1.169  2009/10/08 16:09:42  arekm
-- rel 4; branch diff fixes
+Revision 1.157.2.18  2009/12/01 19:34:14  shadzik
+- fix dirs
 
-Revision 1.168  2009/10/04 14:28:14  shadzik
-- R: QtOpenGL-devel in -devel subpackage
+Revision 1.157.2.17  2009/12/01 19:27:41  shadzik
+- 4.4 beta1
+
+Revision 1.157.2.16  2009/11/28 17:59:44  shadzik
+- 4.3.77
+
+Revision 1.157.2.15  2009/11/18 12:31:14  paszczus
+- added missing %dir
+
+Revision 1.157.2.14  2009/11/17 01:43:05  shadzik
+- 4.3.75
+
+Revision 1.157.2.13  2009/11/14 15:38:35  cactus
+- up to 4.3.74
+
+Revision 1.157.2.12  2009/11/02 02:09:21  shadzik
 - rel 3
 
-Revision 1.167  2009/10/04 14:15:25  shadzik
-- BR: QtOpenGL-devel to hopefully generate glapplet.h
+Revision 1.157.2.11  2009/11/02 00:26:17  shadzik
+- add bindingsfix.patch
 - rel 2
 
-Revision 1.166  2009/10/03 11:59:18  shadzik
-- updated qt BR
+Revision 1.157.2.10  2009/10/28 21:24:49  shadzik
+- 4.3.73
+
+Revision 1.157.2.9  2009/10/18 12:48:46  paszczus
+- updated to 4.3.72
 
-Revision 1.165  2009/10/02 17:31:19  shadzik
-- 4.3.2 try #1
+Revision 1.157.2.8  2009/10/01 21:50:33  cactus
+- up to 4.3.69
 
-Revision 1.164  2009/08/29 20:32:23  glen
-- just rm the unwanted file
+Revision 1.157.2.7  2009/09/23 07:52:04  cactus
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.179&r2=1.180&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to