From: Arkadiusz Miśkiewicz Date: Thu, 19 Jan 2012 07:41:27 +0000 (+0000) Subject: - up to 4.8.0 X-Git-Tag: auto/th/kde4-kdebase-runtime-4_8_0-1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=df1665455af74e59b4e129a7841cdc48077beeb5;p=packages%2Fkde4-kdebase-runtime.git - up to 4.8.0 Changed files: kde4-kdebase-runtime-qzeitgeist.patch -> 1.2 kde4-kdebase-runtime.spec -> 1.155 --- diff --git a/kde4-kdebase-runtime-qzeitgeist.patch b/kde4-kdebase-runtime-qzeitgeist.patch deleted file mode 100644 index ff45fc9..0000000 --- a/kde4-kdebase-runtime-qzeitgeist.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- 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 --#include --#include -+#include -+#include -+#include - - 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 6a45324..be18cc3 100644 --- a/kde4-kdebase-runtime.spec +++ b/kde4-kdebase-runtime.spec @@ -5,24 +5,23 @@ # %define _state stable %define orgname kde-runtime -%define qtver 4.7.4 +%define qtver 4.8.0 %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.7.4 -Release: 2 +Version: 4.8.0 +Release: 1 License: GPL Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 -# Source0-md5: 8e6af5f464ae06e3b7cbfd73aa9f7971 +# Source0-md5: 571563f6ab330348d3f917abdf9c69e4 Source1: kdebase-searchproviders.tar.bz2 # Source1-md5: 126c3524b5367f5096a628acbf9dc86f 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 @@ -96,7 +95,6 @@ Wtyczki KDE 4 dla Phonona. %setup -q -n %{orgname}-%{version} -a1 #%patch100 -p1 %patch0 -p1 -%patch1 -p1 %build install -d build @@ -144,7 +142,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 @@ -172,6 +169,7 @@ 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}/nepomuk-simpleresource-rcgen %attr(755,root,root) %{_bindir}/nepomukbackup %attr(755,root,root) %{_bindir}/nepomukcontroller %attr(755,root,root) %{_bindir}/nepomukindexer @@ -264,12 +262,11 @@ rm -rf $RPM_BUILD_ROOT #%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/nepomukfileindexer.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 @@ -331,11 +328,10 @@ rm -rf $RPM_BUILD_ROOT #%dir %{_datadir}/apps/nepomuk #%dir %{_datadir}/apps/nepomuk/ontologies #%{_datadir}/apps/nepomuk/ontologies/* +%{_datadir}/apps/fileindexerservice %{_datadir}/apps/nepomukfilewatch %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 @@ -373,13 +369,11 @@ rm -rf $RPM_BUILD_ROOT %{_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 @@ -400,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kde4/services/lzma.protocol %{_datadir}/kde4/services/man.protocol %{_datadir}/kde4/services/nepomuk.protocol +%{_datadir}/kde4/services/nepomukfileindexer.desktop %{_datadir}/kde4/services/nepomukactivitiesservice.desktop %{_datadir}/kde4/services/nepomukbackupsync.desktop %{_datadir}/kde4/services/nepomukremovablestorageservice.desktop