From 8c47bf5ff8e0e70330b02549dddcbf07e15032b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= Date: Tue, 29 Jan 2013 13:31:59 +0100 Subject: [PATCH] Update to 4.9.98, add support for Google Gadgets (in separate package) --- .abf.yml | 4 ++- kde-workspace-4.9.5-l10n-ru.patch | 24 ++++++++-------- kdebase4-workspace.spec | 46 ++++++++++++++++++++++--------- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/.abf.yml b/.abf.yml index c9c77ee..58a6127 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,6 @@ +removed_sources: + kde-workspace-4.9.5.tar.xz: 20cfefd98a8dddef963b86ff0c7b832a464593fb sources: + kde-workspace-4.9.98.tar.xz: e3fca63a2a37e78b5a6505af2329558284f9c5da kdebase-workspace-kdm-2.7.tar.bz2: 0a91235a76db901a16ec8dcafff04cfccdac9868 kdebase-workspace-plasma-applet-systemtray-1.2.tar.gz: d6a5229c84e8ec95ed72f88f7937900135d09f58 - kde-workspace-4.9.5.tar.xz: 20cfefd98a8dddef963b86ff0c7b832a464593fb diff --git a/kde-workspace-4.9.5-l10n-ru.patch b/kde-workspace-4.9.5-l10n-ru.patch index 3329376..713a10c 100644 --- a/kde-workspace-4.9.5-l10n-ru.patch +++ b/kde-workspace-4.9.5-l10n-ru.patch @@ -1,25 +1,24 @@ -diff -urN kde-workspace-4.9.5/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop kde-workspace-4.9.5-patched/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop ---- kde-workspace-4.9.5/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop 2012-12-28 04:54:16.777717437 +1100 -+++ kde-workspace-4.9.5-patched/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop 2013-01-26 15:25:28.278178158 +1100 -@@ -37,7 +37,7 @@ - Name[pl]=Ustawienia działań +--- kde-workspace-4.9.98/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop.0004~ 2013-01-15 17:10:50.000000000 +0100 ++++ kde-workspace-4.9.98/powerdevil/kcmodule/activities/powerdevilactivitiesconfig.desktop 2013-01-29 02:09:12.707089141 +0100 +@@ -39,7 +39,7 @@ Name[pl]=Ustawienia działań Name[pt]=Configuração da Actividade Name[pt_BR]=Configurações da atividade + Name[ro]=Configurare activități -Name[ru]=Настройка активных действий +Name[ru]=Настройка для комнат Name[sk]=Nastavenie aktivity Name[sl]=Nastavitve dejavnosti Name[sr]=Поставке активности -@@ -77,7 +77,7 @@ - Comment[pl]=Konfiguracja zarządzania energią charakterystycznie dla działania +@@ -81,7 +81,7 @@ Comment[pl]=Konfiguracja zarządzania en Comment[pt]=Configurar a Gestão de Energia por Actividade Comment[pt_BR]=Configura o gerenciamento de energia por atividade + Comment[ro]=Configurează gestiunea alimentării per activitate -Comment[ru]=Настройки параметров энергосбережения для активных действий +Comment[ru]=Настройка параметров энергосбережения отдельно для каждой комнаты Comment[sk]=Nastaviť nastavenia správy napájania podľa aktivity Comment[sl]=Nastavitve upravljanja z energijo glede na dejavnost Comment[sr]=Подешавање управљања напајањем према активности -@@ -115,7 +115,7 @@ +@@ -120,7 +120,7 @@ X-KDE-Keywords[nl]=systeem,energie,energ X-KDE-Keywords[pl]=system,moc,zarządzanie energią,energia,laptop,bateria,wstrzymanie,AC,wstrzymaj,hibernuj,jasność,wydajność,pokrywka,działanie,działania X-KDE-Keywords[pt]=sistema,energia,gestão de energia,portátil,bateria,suspensão,AC,suspender,hibernar,brilho,performance,tampo,actividade,actividades X-KDE-Keywords[pt_BR]=sistema,energia,gerenciamento de energia,energia,portátil,laptop,notebook,bateria,suspensão,AC,suspender,hibernar,brilho,desempenho,tampa,atividade,atividades @@ -28,13 +27,12 @@ diff -urN kde-workspace-4.9.5/powerdevil/kcmodule/activities/powerdevilactivitie X-KDE-Keywords[sk]=systém,napájanie,správa napájanie,energia,laptop,batéria,uspanie,AC,uspať,hibernovať,jas,výkon,kryt,aktivita,aktivity X-KDE-Keywords[sl]=sistem,energija,upravljanje z energijo,prenosnik,prenosni računalnik,baterija,akumulator,pripravljenost,mirovanje,električno omrežje,svetlost,zmogljivost,pokrov,dejavnost,dejavnosti,napajanje X-KDE-Keywords[sr]=system,power,power management,energy,laptop,battery,suspension,AC,suspend,hibernate,brightness,performance,lid,activity,activities,систем,напајање,струја,управљање напајањем,лаптоп,батерија,суспендовање,АЦ,хибернација,светлина,осветљај,перформансе,поклопац,активност -diff -urN kde-workspace-4.9.5/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop kde-workspace-4.9.5-patched/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop ---- kde-workspace-4.9.5/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop 2012-12-28 04:54:16.777717437 +1100 -+++ kde-workspace-4.9.5-patched/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop 2013-01-26 15:28:44.525019752 +1100 -@@ -78,7 +78,7 @@ - Comment[pl]=Konfiguracja zaawansowanych ustawienia zarządzania energią +--- kde-workspace-4.9.98/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop.0004~ 2013-01-29 02:01:31.119529861 +0100 ++++ kde-workspace-4.9.98/powerdevil/kcmodule/global/powerdevilglobalconfig.desktop 2013-01-29 02:09:50.963636201 +0100 +@@ -82,7 +82,7 @@ Comment[pl]=Konfiguracja zaawansowanych Comment[pt]=Configurar a Gestão de Energia Avançada Comment[pt_BR]=Configura as opções avançadas de gerenciamento de energia + Comment[ro]=Configurează opțiunile avansate de gestiune a alimentării -Comment[ru]=Настройка дополнительных параметров энергосбережения +Comment[ru]=Дополнительные параметры управления питанием Comment[sk]=Nastaviť nastavenia pokročilej správy napájania diff --git a/kdebase4-workspace.spec b/kdebase4-workspace.spec index da54205..20b3b1f 100644 --- a/kdebase4-workspace.spec +++ b/kdebase4-workspace.spec @@ -10,13 +10,19 @@ Name: kdebase4-workspace Summary: KDE 4 application workspace components -Version: 4.9.5 +Version: 4.9.98 Release: 1 Epoch: 2 Group: Graphical desktop/KDE License: GPL URL: http://www.kde.org -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}.tar.xz +%define is_beta %(if test `echo %version |cut -d. -f3` -ge 70; then echo -n 1; else echo -n 0; fi) +%if %is_beta +%define ftpdir unstable +%else +%define ftpdir stable +%endif +Source: ftp://ftp.kde.org/pub/kde/%ftpdir/%{version}/src/kde-workspace-%{version}.tar.xz Source1: kde.pam Source2: kde-np.pam Source3: mandriva-startkde @@ -54,6 +60,7 @@ BuildRequires: libsasl-devel BuildRequires: lm_sensors-devel BuildRequires: openldap-devel BuildRequires: python-kde4-devel +BuildRequires: prison-devel BuildRequires: automoc4 BuildRequires: bdftopcf BuildRequires: imake @@ -82,6 +89,7 @@ BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(qimageblitz) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(libggadget-1.0) pkgconfig(libggadget-qt-1.0) Requires: qt4-qtdbus Requires: kdebase4-runtime Requires: strigi @@ -108,6 +116,20 @@ Suggests: kickoff %description This package contains the KDE 4 application workspace components. +%package google-gadgets +Summary: Support for running google-gadgets in Plasma +Group: Graphical desktop/KDE +Requires: %name = %EVRD + +%description google-gadgets +Support for running google-gadgets in Plasma + +%files google-gadgets +%_libdir/kde4/plasma_package_ggl.so +%_libdir/kde4/plasma_scriptengine_ggl.so +%_datadir/kde4/services/plasma-packagestructure-googlegadgets.desktop +%_datadir/kde4/services/plasma-scriptengine-googlegadgets.desktop + %post %make_session @@ -156,16 +178,13 @@ This package contains the KDE 4 application workspace components. %{_kde_bindir}/plasma-netbook %{_kde_bindir}/plasma-overlay %{_kde_bindir}/plasma-windowed -%{_kde_bindir}/plasmaengineexplorer -%{_kde_bindir}/plasmawallpaperviewer -%{_kde_bindir}/plasmoidviewer %{_kde_bindir}/solid-action-desktop-gen %{_kde_bindir}/solid-network %{_kde_bindir}/startkde %{_kde_bindir}/oxygen-shadow-demo -%{_kde_bindir}/remote-widgets-browser %{_kde_bindir}/systemsettings %{_kde_libdir}/kconf_update_bin/* +%{_kde_libdir}/kde4/imports %{_kde_libdir}/kde4/classic_mode.so %{_kde_libdir}/kde4/fontthumbnail.so %{_kde_libdir}/kde4/icon_mode.so @@ -239,19 +258,19 @@ This package contains the KDE 4 application workspace components. %{_kde_libdir}/kde4/kwin3_b2.so %{_kde_libdir}/kde4/kwin3_laptop.so %{_kde_libdir}/kde4/kwin3_oxygen.so -%{_kde_libdir}/kde4/kwin3_plastik.so %{_kde_libdir}/kde4/kwin4_effect_builtins.so %{_kde_libdir}/kde4/kwin_b2_config.so %{_kde_libdir}/kde4/kwin_oxygen_config.so -%{_kde_libdir}/kde4/kwin_plastik_config.so %{_kde_libdir}/kde4/libexec/fontinst %{_kde_libdir}/kde4/libexec/fontinst_helper %{_kde_libdir}/kde4/libexec/fontinst_x11 -%{_kde_libdir}/kde4/libexec/kscreenlocker %{_kde_libdir}/kde4/libexec/ksysguardprocesslist_helper %{_kde_libdir}/kde4/libexec/kwin_killer_helper %{_kde_libdir}/kde4/libexec/kwin_opengl_test %{_kde_libdir}/kde4/libexec/kwin_rules_dialog +%{_kde_libdir}/kde4/libexec/kscreenlocker_greet +%{_kde_libdir}/kde4/kded_appmenu.so +%{_kde_libdir}/kde4/kded_ktouchpadenabler.so %{_kde_libdir}/kde4/plasma-geolocation-gps.so %{_kde_libdir}/kde4/plasma-geolocation-ip.so %{_kde_libdir}/kde4/plasma_animator_default.so @@ -261,7 +280,6 @@ This package contains the KDE 4 application workspace components. %{_kde_libdir}/kde4/plasma_applet_dig_clock.so %{_kde_libdir}/kde4/plasma_applet_icon.so %{_kde_libdir}/kde4/plasma_applet_keyboard.so -%{_kde_libdir}/kde4/plasma_applet_notifications.so %{_kde_libdir}/kde4/plasma_applet_pager.so %{_kde_libdir}/kde4/plasma_applet_panelspacer_internal.so %{_kde_libdir}/kde4/plasma_applet_searchbox.so @@ -347,6 +365,7 @@ This package contains the KDE 4 application workspace components. %{_kde_appsdir}/katepart %{_kde_appsdir}/kcminput %{_kde_appsdir}/kcmkeys +%{_kde_appsdir}/kcmstyle %{_kde_appsdir}/kcmsolidactions %{_kde_appsdir}/kconf_update/* %{_kde_appsdir}/kcontrol @@ -356,7 +375,6 @@ This package contains the KDE 4 application workspace components. %{_kde_appsdir}/khotkeys %{_kde_appsdir}/kmenuedit %{_kde_appsdir}/konqsidebartng/virtual_folders/services/fonts.desktop -%{_kde_appsdir}/kscreenlocker %{_kde_appsdir}/ksmserver %{_kde_appsdir}/ksplash %{_kde_appsdir}/kstyle @@ -380,6 +398,7 @@ This package contains the KDE 4 application workspace components. %{_kde_configdir}/colorschemes.knsrc %{_kde_configdir}/ksplash.knsrc %{_kde_configdir}/ksysguard.knsrc +%{_kde_configdir}/kwineffect.knsrc %{_kde_configdir}/kwinscripts.knsrc %{_kde_configdir}/kwinswitcher.knsrc %{_kde_configdir}/plasma-overlayrc @@ -428,11 +447,13 @@ This package contains the KDE 4 application workspace components. %{_kde_services}/kcmaccess.desktop %{_kde_services}/kcmlaunch.desktop %{_kde_services}/kcmsmserver.desktop +%{_kde_services}/kded/appmenu.desktop %{_kde_services}/kded/freespacenotifier.desktop %{_kde_services}/kded/kephal.desktop %{_kde_services}/kded/keyboard.desktop %{_kde_services}/kded/khotkeys.desktop %{_kde_services}/kded/kwrited.desktop +%{_kde_services}/kded/ktouchpadenabler.desktop %{_kde_services}/kded/randrmonitor.desktop %{_kde_services}/kded/statusnotifierwatcher.desktop %{_kde_services}/keys.desktop @@ -465,7 +486,7 @@ This package contains the KDE 4 application workspace components. %{_kde_services}/plasma-applet-digitalclock.desktop %{_kde_services}/plasma-applet-icon.desktop %{_kde_services}/plasma-applet-lockout.desktop -%{_kde_services}/plasma-applet-notifications.desktop +%{_kde_services}/plasma-applet-org.kde.notifications.desktop %{_kde_services}/plasma-applet-panelspacer-internal.desktop %{_kde_services}/plasma-applet-searchbox.desktop %{_kde_services}/plasma-applet-sm_hdd_activity.desktop @@ -615,7 +636,6 @@ This package contains the KDE 4 application workspace components. %{_kde_services}/style.desktop %{_kde_services}/workspaceoptions.desktop %{_kde_servicetypes}/*.desktop -%{_kde_mandir}/man1/* %{_kde_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_kde_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy %{_kde_datadir}/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy