- added -qzeitgeist.patch (now builds with libqzeitgeist >= 0.8)

- updatates BRs

Changed files:
    kde4-kdebase-runtime-qzeitgeist.patch -> 1.1
    kde4-kdebase-runtime.spec -> 1.154

diff --git a/kde4-kdebase-runtime-qzeitgeist.patch b/kde4-kdebase-runtime-qzeitgeist.patch
new file mode 100644 (file)
index 0000000..ff45fc9
--- /dev/null
+++ b/kde4-kdebase-runtime-qzeitgeist.patch
@@ -0,0 +1,100 @@
+--- kde-runtime-4.7.4/activitymanager/CMakeLists.txt.orig      2011-12-02 00:25:05.000000000 +0100
++++ kde-runtime-4.7.4/activitymanager/CMakeLists.txt   2011-12-30 02:27:41.851186489 +0100
+@@ -25,12 +25,12 @@
+ macro_optional_find_package(QZeitgeist)
+ 
+ if (QZEITGEIST_INCLUDE_DIR)
+-    if (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
++    if (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
+         set(QZeitgeist_FOUND TRUE)
+-    else (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
+-        message(STATUS "QZeitgeist 0.8.0 and greater are not supported")
++    else (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
++        message(STATUS "QZeitgeist 0.9.0 and greater are not supported")
+         set(QZeitgeist_FOUND FALSE)
+-    endif (QZEITGEIST_VERSION VERSION_LESS 0.8.0)
++    endif (QZEITGEIST_VERSION VERSION_LESS 0.9.0)
+ endif(QZEITGEIST_INCLUDE_DIR)
+ 
+ macro_log_feature(
+--- kde-runtime-4.7.4/activitymanager/ZeitgeistEventBackend.cpp.orig   2011-06-22 16:30:08.000000000 +0200
++++ kde-runtime-4.7.4/activitymanager/ZeitgeistEventBackend.cpp        2011-12-30 02:27:41.853186489 +0100
+@@ -21,31 +21,31 @@
+ 
+ #ifndef HAVE_QZEITGEIST
+ #ifdef __GNUC__
+-    #warning "No QtZeitgeist, disabling desktop events processing"
++    #warning "No QZeitgeist, disabling desktop events processing"
+ #endif
+ 
+ #else // HAVE_QZEITGEIST
+ 
+ #include "ZeitgeistEventBackend.h"
+ 
+-#include <QtZeitgeist/QtZeitgeist>
+-#include <QtZeitgeist/Interpretation>
+-#include <QtZeitgeist/Manifestation>
++#include <QZeitgeist/QZeitgeist>
++#include <QZeitgeist/Interpretation>
++#include <QZeitgeist/Manifestation>
+ 
+ static QString eventInterpretation(Event::Type type)
+ {
+     switch (type) {
+         case Event::Accessed:
+-            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
+ 
+         case Event::Opened:
+-            return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
++            return QZeitgeist::Interpretation::Event::ZGAccessEvent;
+ 
+         case Event::Modified:
+-            return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
++            return QZeitgeist::Interpretation::Event::ZGModifyEvent;
+ 
+         case Event::Closed:
+-            return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
++            return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
+ 
+     }
+ 
+@@ -57,23 +57,23 @@
+ {
+     switch (reason) {
+         case Event::User:
+-            return QtZeitgeist::Manifestation::Event::ZGUserActivity;
++            return QZeitgeist::Manifestation::Event::ZGUserActivity;
+ 
+         case Event::Heuristic:
+-            return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
++            return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
+ 
+         case Event::Scheduled:
+-            return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
++            return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
+ 
+         case Event::System:
+-            return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
++            return QZeitgeist::Manifestation::Event::ZGSystemNotification;
+ 
+         case Event::World:
+-            return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
++            return QZeitgeist::Manifestation::Event::ZGWorldActivity;
+     }
+ 
+     // shut up GCC
+-    return QtZeitgeist::Manifestation::Event::ZGUserActivity;
++    return QZeitgeist::Manifestation::Event::ZGUserActivity;
+ }
+ 
+ static QString applicationUri(const QString & application)
+@@ -84,7 +84,7 @@
+ 
+ ZeitgeistEventBackend::ZeitgeistEventBackend()
+ {
+-    QtZeitgeist::init();
++    
+ }
+ 
+ void ZeitgeistEventBackend::addEvents(const EventList & events)

diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec
index 5267217846dd648822119d0fa2b1f2559e3fcc62..6a45324a4ee9415bfedb5d3de3ed55694d55faad 100644 (file)
--- a/kde4-kdebase-runtime.spec
+++ b/kde4-kdebase-runtime.spec
@@ -22,6 +22,7 @@ Source1:      kdebase-searchproviders.tar.bz2
 Source2:       l10n-iso639-1
 Patch100:      %{name}-branch.diff
 Patch0:                %{name}-rpc.patch
+Patch1:                %{name}-qzeitgeist.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenEXR-devel
 BuildRequires: alsa-lib-devel
@@ -30,12 +31,14 @@ 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-kdelibs-devel >= %{version}
 BuildRequires: kde4-kdepimlibs-devel >= %{version}
 BuildRequires: libcanberra-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libqzeitgeist-devel
+BuildRequires: libqzeitgeist-devel >= 0.8
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 1:0.4.0
 BuildRequires: libtirpc-devel
@@ -48,6 +51,7 @@ BuildRequires:        qt4-build >= %{qtver}
 BuildRequires: qt4-qmake >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.600
 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
@@ -92,6 +96,7 @@ Wtyczki KDE 4 dla Phonona.
 %setup -q -n %{orgname}-%{version} -a1
 #%patch100 -p1
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build