Wed Aug 5 00:22:24 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17957/F-10

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.2.85-ck-shutdown.patch 
	kdebase-workspace-4.2.85-klipper-url.patch 
	kdebase-workspace-4.2.90-show_systemsettings.patch 
	kdebase-workspace-4.2.95-default-applets.patch 
	kdebase-workspace-4.2.95-plasma-konsole.patch 
	kdebase-workspace-4.2.95-rootprivs.patch 
	kdebase-workspace-4.2.96-redhat-startkde.patch 
	kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch 
Removed Files:
	kdebase-workspace-4.0.3-timedate-kcm.patch 
	kdebase-workspace-4.0.72-ck-shutdown.patch 
	kdebase-workspace-4.0.72-klipper-url.patch 
	kdebase-workspace-4.1.2-rootprivs.patch 
	kdebase-workspace-4.1.96-AllowExternalPaths.patch 
	kdebase-workspace-4.2.0-bluetooth-revert.patch 
	kdebase-workspace-4.2.0-default_applets.patch 
	kdebase-workspace-4.2.0-kde#180576.patch 
	kdebase-workspace-4.2.0-show-systemsettings.patch 
	kdebase-workspace-4.2.1-plasma-konsole.patch 
	kdebase-workspace-4.2.1-redhat-startkde.patch 
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace-4.2.3-weather-dataengine-nm.patch 
	kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch 
	kdebase-workspace-4.3.0-desktopnumbers.patch 
	kdebase-workspace-4.3.0-device-notifier-luks.patch 
Log Message:
kde-4.3.0


kdebase-workspace-4.2.85-ck-shutdown.patch:
 kdisplaymanager.cpp |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

--- NEW FILE kdebase-workspace-4.2.85-ck-shutdown.patch ---
diff -up kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp.ck-shutdown	2009-04-28 15:46:11.000000000 +0200
+++ kdebase-workspace-4.2.85/libs/kworkspace/kdisplaymanager.cpp	2009-05-11 22:49:41.000000000 +0200
@@ -26,6 +26,7 @@
 #include <QtDBus/QtDBus>
 
 #include <QRegExp>
+#include <QLatin1String>
 
 #include <X11/Xauth.h>
 #include <X11/Xlib.h>
@@ -85,6 +86,7 @@ KDisplayManager::KDisplayManager() : d(n
 				strcpy( sa.sun_path, "/tmp/.gdm_socket" );
 				if (::connect( d->fd, (struct sockaddr *)&sa, sizeof(sa) )) {
 					::close( d->fd );
+					DMType = NoDM;
 					d->fd = -1;
 					break;
 				}
@@ -186,6 +188,21 @@ KDisplayManager::exec( const char *cmd, 
 bool
 KDisplayManager::canShutdown()
 {
+	if (DMType == NoDM) {
+		// No DM or newest GDM running, we'll try shutting down through ConsoleKit.
+		// Unfortunately, ConsoleKit won't tell us if we're allowed to do that
+		// (it also depends on whether there are other users logged in on the
+		// system), so we can only check if it's running at all.
+		QDBusConnection systemBus = QDBusConnection::systemBus();
+		if (!systemBus.isConnected())
+			return false;
+		QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+		                           QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+		                           QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+		                           systemBus );
+		return consoleKit.isValid();
+	}
+
 	if (DMType == OldKDM)
 		return strstr( ctl, ",maysd" ) != 0;
 
@@ -205,6 +222,21 @@ KDisplayManager::shutdown( KWorkSpace::S
 	if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
 		return;
 
+        if (DMType == NoDM) {
+               // No DM or newest GDM running, try shutting down through ConsoleKit.
+               QDBusConnection systemBus = QDBusConnection::systemBus();
+               if (!systemBus.isConnected())
+                       return;
+               QDBusInterface consoleKit( QLatin1String( "org.freedesktop.ConsoleKit" ),
+                                          QLatin1String( "/org/freedesktop/ConsoleKit/Manager" ),
+                                          QLatin1String( "org.freedesktop.ConsoleKit.Manager" ),
+                                          systemBus );
+               if (consoleKit.isValid())
+                       consoleKit.call( QLatin1String( shutdownType == KWorkSpace::ShutdownTypeReboot ?
+                                                       "Restart" : "Stop" ) );
+               return;
+        }
+
 	bool cap_ask;
 	if (DMType == NewKDM) {
 		QByteArray re;

kdebase-workspace-4.2.85-klipper-url.patch:
 klipperrc.desktop |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.2.85-klipper-url.patch ---
diff -up kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url kdebase-workspace-4.2.85/klipper/klipperrc.desktop
--- kdebase-workspace-4.2.85/klipper/klipperrc.desktop.klipper-url	2009-04-05 22:00:13.000000000 +0200
+++ kdebase-workspace-4.2.85/klipper/klipperrc.desktop	2009-05-11 22:56:51.000000000 +0200
@@ -409,7 +409,7 @@ Description[zh_TW]=使用 &Konqueror 開
 Enabled=true
 
 [Action_1/Command_2]
-Commandline=ps x |grep -q '[m]ozilla' && "mozilla -remote openURL(%s, new-window)" || mozilla %s
+Commandline=ps x |grep -q '[m]ozilla' && mozilla -remote 'openURL(%s, new-window)' || mozilla %s
 Icon=mozilla
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
@@ -581,7 +581,7 @@ Description[zh_TW]=送出 &URL
 Enabled=true
 
 [Action_1/Command_4]
-Commandline=ps x |grep -q '[f]irefox' && "firefox -remote openURL(%s, new-window)" || firefox "%s"
+Commandline=ps x |grep -q '[f]irefox' && firefox -remote 'openURL(%s, new-window)' || firefox "%s"
 Icon=firefox
 Description=Open with &Firefox
 Description[af]=Maak oop met Firefox
@@ -1892,7 +1892,7 @@ Description[zh_TW]=使用 &Konqueror 開
 Enabled=true
 
 [Action_6/Command_2]
-Commandline=mozilla -remote openURL(%s, new-window)
+Commandline=mozilla -remote 'openURL(%s, new-window)'
 Description=Open with &Mozilla
 Description[af]=Maak oop met Mozilla
 Description[ar]=افتح بواسطة &موزيلا

kdebase-workspace-4.2.90-show_systemsettings.patch:
 plasma/applets/kickoff/core/applicationmodel.cpp |    1 -
 systemsettings/app/systemsettings.desktop        |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.2.90-show_systemsettings.patch ---
diff -up kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings	2009-05-14 12:26:34.000000000 -0500
+++ kdebase-workspace-4.2.90/plasma/applets/kickoff/core/applicationmodel.cpp	2009-06-03 20:53:41.000000000 -0500
@@ -111,7 +111,6 @@ public:
               displayOrder(NameAfterDescription),
               allowSeparators(_allowSeparators)
     {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop.show-systemsettings	2009-04-30 13:02:27.000000000 -0500
+++ kdebase-workspace-4.2.90/systemsettings/app/systemsettings.desktop	2009-06-03 20:53:41.000000000 -0500
@@ -157,3 +157,4 @@ Name[zh_TW]=系統設定
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;

kdebase-workspace-4.2.95-default-applets.patch:
 desktopcorona.cpp |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

--- NEW FILE kdebase-workspace-4.2.95-default-applets.patch ---
diff -ur kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp
--- kdebase-workspace-4.2.95/plasma/shells/desktop/desktopcorona.cpp	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95-default-applets/plasma/shells/desktop/desktopcorona.cpp	2009-07-03 01:07:27.000000000 +0200
@@ -259,15 +259,22 @@
     loadDefaultApplet("tasks", panel);
     loadDefaultApplet("systemtray", panel);
 
-    Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
-    Plasma::DataEngine *power = engines->loadEngine("powermanagement");
-    if (power) {
-        const QStringList &batteries = power->query("Battery")["sources"].toStringList();
-        if (!batteries.isEmpty()) {
-            loadDefaultApplet("battery", panel);
-        }
+    if ( (!QFile::exists("/usr/share/autostart/guidance-power-manager.desktop")) && 
+         (!QFile::exists("/usr/share/autostart/kpowersave-autostart.desktop")) ) {
+       Plasma::DataEngineManager *engines = Plasma::DataEngineManager::self();
+       Plasma::DataEngine *power = engines->loadEngine("powermanagement");
+       if (power) {
+          const QStringList &batteries = power->query("Battery")["sources"].toStringList();
+          if (!batteries.isEmpty()) {
+             loadDefaultApplet("battery", panel);
+          }
+       }
+       engines->unloadEngine("powermanagement");
+    }
+
+    if (QFile::exists("/usr/share/kde4/services/plasma-applet-networkmanagement.desktop")) {
+       loadDefaultApplet("networkmanagement", panel);
     }
-    engines->unloadEngine("powermanagement");
 
     loadDefaultApplet("digital-clock", panel);
     emit containmentAdded(panel);

kdebase-workspace-4.2.95-plasma-konsole.patch:
 desktop.cpp |   13 +++++++++++++
 desktop.h   |    2 ++
 2 files changed, 15 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp.plasma-konsole	2009-06-17 22:07:42.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.cpp	2009-06-26 12:00:49.000000000 +0200
@@ -41,6 +41,7 @@
 #include <KRun>
 #include <KStandardDirs>
 #include <KWindowSystem>
+#include <ktoolinvocation.h>
 
 #include <Plasma/Corona>
 #include <Plasma/Animator>
@@ -65,6 +66,7 @@ DefaultDesktop::DefaultDesktop(QObject *
       m_runCommandAction(0),
       m_lockScreenAction(0),
       m_logoutAction(0),
+      m_runKonsoleAction(0),
       dropping(false)
 {
     qRegisterMetaType<QImage>("QImage");
@@ -203,6 +205,11 @@ void DefaultDesktop::runCommand()
     krunner.display();
 }
 
+void DefaultDesktop::runKonsole()
+{
+    KToolInvocation::invokeTerminal(QString(), QDir::homePath());
+}
+
 void DefaultDesktop::lockScreen()
 {
     if (!KAuthorized::authorizeKAction("lock_screen")) {
@@ -253,6 +260,10 @@ QList<QAction*> DefaultDesktop::contextu
             m_addPanelAction->setIcon(KIcon("list-add"));
         }
 
+        m_runKonsoleAction = new QAction(i18n("Konsole"), this);
+        connect(m_runKonsoleAction, SIGNAL(triggered(bool)), this, SLOT(runKonsole()));
+        m_runKonsoleAction->setIcon(KIcon("terminal"));
+
         m_runCommandAction = new QAction(i18n("Run Command..."), this);
         m_runCommandAction->setIcon(KIcon("system-run"));
         connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
@@ -272,6 +283,8 @@ QList<QAction*> DefaultDesktop::contextu
 
     QList<QAction*> actions;
 
+    actions.append(m_runKonsoleAction);
+
     if (KAuthorized::authorizeKAction("run_command")) {
         actions.append(m_runCommandAction);
     }
diff -up kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h.plasma-konsole	2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.95/plasma/containments/desktop/desktop.h	2009-06-26 11:49:24.000000000 +0200
@@ -70,6 +70,7 @@ protected:
     void dropEvent(QGraphicsSceneDragDropEvent *event);
 
 protected Q_SLOTS:
+    void runKonsole();
     void runCommand();
 
     void lockScreen();
@@ -89,6 +90,7 @@ private:
     QAction *m_lockDesktopAction;
     QAction *m_appletBrowserAction;
     QAction *m_addPanelAction;
+    QAction *m_runKonsoleAction;
     QAction *m_runCommandAction;
     QAction *m_setupDesktopAction;
     QAction *m_lockScreenAction;

kdebase-workspace-4.2.95-rootprivs.patch:
 ModuleView.cpp |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

--- NEW FILE kdebase-workspace-4.2.95-rootprivs.patch ---
diff -ur kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp
--- kdebase-workspace-4.2.95/systemsettings/core/ModuleView.cpp	2009-06-23 13:14:38.000000000 +0200
+++ kdebase-workspace-4.2.95-rootprivs/systemsettings/core/ModuleView.cpp	2009-06-29 19:39:01.000000000 +0200
@@ -39,6 +39,7 @@
 #include <KCModuleProxy>
 #include <KStandardGuiItem>
 #include <KDialogButtonBox>
+#include <KStandardDirs>
 
 #include "MenuItem.h"
 
@@ -124,6 +125,32 @@
       return;
     }
 
+    if ( menuItem->service()->property( "X-KDE-RootOnly", QVariant::Bool ).toBool() ) {
+        QString kdesu = KStandardDirs::findExe( "kdesu" );
+        QString cmd = menuItem->service()->exec().trimmed();
+
+        /* Prepare the process to run the kcmshell */
+        if ( cmd.left(5) == "kdesu" )
+        {
+            cmd = cmd.remove(0,5).trimmed();
+
+            /* Remove all kdesu switches */
+            while ( cmd.length() > 1 && cmd[ 0 ] == '-' )
+                cmd = cmd.remove( 0, cmd.indexOf( ' ' ) ).trimmed();
+        }
+
+        if ( cmd.left(9) == "kcmshell4" )
+            cmd = cmd.remove(0,9).trimmed();
+
+        QStringList args;
+        args << "-i" << QString( menuItem->service()->icon() ) << "-c" << QString( "%1 %2 --lang %3" ).arg( KStandardDirs::locate("exe", "kcmshell4") ).arg( cmd ).arg( KGlobal::locale()->language() );
+
+        kDebug() << "Starting root module: " << args;
+        QProcess::startDetached( kdesu, args );
+
+        return;
+    }
+
     QList<KCModuleInfo*> modules;
     if ( menuItem->children().empty() ) {
         modules << &menuItem->item();

kdebase-workspace-4.2.96-redhat-startkde.patch:
 startkde.cmake |   35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

--- NEW FILE kdebase-workspace-4.2.96-redhat-startkde.patch ---
diff -up kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde kdebase-workspace-4.2.96/startkde.cmake
--- kdebase-workspace-4.2.96/startkde.cmake.redhat-startkde	2009-07-08 16:45:04.000000000 +0200
+++ kdebase-workspace-4.2.96/startkde.cmake	2009-07-16 15:28:12.000000000 +0200
@@ -22,36 +22,20 @@ if test $kcheckrunning_result -eq 0 ; th
 	exit 1
 elif test $kcheckrunning_result -eq 2 ; then
 	echo "\$DISPLAY is not set or cannot connect to the X server."
-        exit 1
+        exit 1 
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default.
 # The standard X background is nasty, causing moire effects and exploding
 # people's heads. We use colours from the standard KDE palette for those with
 # palettised displays.
 if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
-  xsetroot -solid "#000000"
+  xsetroot -solid "#103D77"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 unset DYLD_FORCE_FLAT_NAMESPACE
 
-# in case we have been started with full pathname spec without being in PATH
-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-if [ -n "$bindir" ]; then
-  qbindir=`$bindir/kde4-config --qt-binaries`
-  if [ -n "$qbindir" ]; then
-    case $PATH in
-      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-      *) PATH=$qbindir:$PATH; export PATH;;
-    esac
-  fi
-  case $PATH in
-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-    *) PATH=$bindir:$PATH; export PATH;;
-  esac
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage
@@ -89,6 +73,13 @@ kcmrandrrc [Screen3]
 kcmfonts General forceFontDPI 0
 kdeglobals Locale Language '' # trigger requesting languages from KLocale
 EOF
+# read the default KSplash theme to use out of kde-settings
+if [ -e /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc ]
+  then eval `grep '^Theme=' /usr/share/kde-settings/kde-profile/default/share/config/ksplashrc`
+       if [ -n "$Theme" ]
+         then sed -i -e "s/Default/$Theme/g" $kdehome/share/config/startupconfigkeys
+       fi
+fi
 kstartupconfig4
 returncode=$?
 if test $returncode -ne 0; then
@@ -209,8 +200,9 @@ fi
 # better use the Autostart folder.
 
 libpath=`kde4-config --path lib | tr : '\n'`
+envpath=/etc/kde/env/
 
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'` $envpath ; do
   for file in "$prefix"*.sh; do
     test -r "$file" && . "$file"
   done
@@ -423,7 +415,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
 echo 'startkde: Running shutdown scripts...'  1>&2
 
 # Run scripts found in $KDEDIRS/shutdown
-for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+shutdownpath=/etc/kde/shutdown/
+for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'` $shutdownpath; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done

kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch:
 battery.cpp |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch ---
diff -ur kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp
--- kdebase-workspace-4.3.0/plasma/applets/battery/battery.cpp	2009-07-08 16:45:03.000000000 +0200
+++ kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime/plasma/applets/battery/battery.cpp	2009-08-03 06:43:04.000000000 +0200
@@ -530,7 +530,11 @@
             QString state = battery_data.value()["State"].toString();
             m_remainingMSecs = battery_data.value()["Remaining msec"].toInt();
             //kDebug() << "time left:" << m_remainingMSecs;
-            if (state == "Discharging" && m_remainingMSecs > 0 && m_showRemainingTime) {
+            // Always show the remaining time in the popup (like KDE 4.2.x did).
+            // We don't just set m_showRemainingTime to true by default because
+            // that'd try to use the time also for the icon. That won't fit on
+            // small panels and wasn't the default in 4.2 either.
+            if (state == "Discharging" && m_remainingMSecs > 0) {
 
                 // FIXME: Somehow, m_extenderApplet is null here, so the label never becomes visible
                 if (m_extenderApplet) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore	30 May 2009 10:58:08 -0000	1.25
+++ .cvsignore	5 Aug 2009 00:22:21 -0000	1.26
@@ -1 +1,5 @@
-kdebase-workspace-4.2.4.tar.bz2
+kdebase-workspace-4.2.90.tar.bz2
+kdebase-workspace-4.2.95.tar.bz2
+kdebase-workspace-4.2.96.tar.bz2
+kdebase-workspace-4.2.98.tar.bz2
+kdebase-workspace-4.3.0.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- kdebase-workspace.spec	9 Jul 2009 20:45:30 -0000	1.182
+++ kdebase-workspace.spec	5 Aug 2009 00:22:23 -0000	1.183
@@ -1,12 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%if 0%{?fedora} <= 9
-%define have_bluez3 1
-%endif
-
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.4
+Version: 4.3.0
 
 Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
@@ -15,42 +11,36 @@ Group: User Interface/Desktops
 URL: http://www.kde.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kdebase-workspace-4.2.1-redhat-startkde.patch
-Patch2: kdebase-workspace-4.2.1-plasma-konsole.patch
-Patch3: kdebase-workspace-4.2.0-show-systemsettings.patch
-Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
-# 434824: KDE4 System Settings - No Method To Enter Administrative Mode
-Patch5: kdebase-workspace-4.1.2-rootprivs.patch
-Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
+Patch1: kdebase-workspace-4.2.96-redhat-startkde.patch
+Patch2: kdebase-workspace-4.2.95-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
+Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
 # 441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
-Patch8: kdebase-workspace-4.0.72-klipper-url.patch
+Patch8: kdebase-workspace-4.2.85-klipper-url.patch
+# 434824: KDE4 System Settings - No Method To Enter Administrative Mode
+Patch9: kdebase-workspace-4.2.95-rootprivs.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
-Patch12: kdebase-workspace-4.2.0-default_applets.patch
+Patch12: kdebase-workspace-4.2.95-default-applets.patch
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
-# Fix kde#165726: klipper crashed when opening link with external application
-# It's already fixed in 4.3 as part of a larger commit, but the fix never got
-# backported to 4.2.
-Patch16: kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch
+# show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+Patch16: kdebase-workspace-4.3.0-battery-plasmoid-showremainingtime.patch
 
 # upstream patches:
+# 4.3 branch
+
 # trunk
-Patch100: kdebase-workspace-4.1.96-AllowExternalPaths.patch
-# solid-bluetooth, https://bugzilla.redhat.com/481801
-Patch101: solid-bluetoothTrunkTo42.diff
-# revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
-# 0.3 requires BlueZ 4 and the patch above
-Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
-# from 4.3: http://bugs.kde.org/180576
-Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-# 4.3, https://bugs.kde.org/show_bug.cgi?id=184152
-Patch105: kdebase-workspace-4.3.0-desktopnumbers.patch
-# from 4.3: check for network avail. through Solid/NM in the weather dataengine
-Patch106: kdebase-workspace-4.2.3-weather-dataengine-nm.patch
-# 4.3: #510527 -  Encrypted USB drives don't show up in KDE device notifier
-Patch107: kdebase-workspace-4.3.0-device-notifier-luks.patch
+
+# moving to non-multilib hack
+Obsoletes: kdebase-workspace < 4.3.0-2
+
+Obsoletes: PolicyKit-kde < %{version}-100 
+Provides:  PolicyKit-kde = %{version}-100
+# This can be used by apps which want to use the PolicyKit
+# frontend implementation of the desktop they are running under
+Provides: PolicyKit-authentication-agent
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -70,11 +60,15 @@ Obsoletes: kpowersave < 0.7.3-10
 Obsoletes: guidance-power-manager < 4.3
 %endif
 
+BuildRequires: akonadi-devel
 BuildRequires: bluez-libs-devel
 BuildRequires: ConsoleKit-devel
+BuildRequires: desktop-file-utils
 BuildRequires: google-gadgets-devel >= 0.10.5
 BuildRequires: glib2-devel
+BuildRequires: gpsd-devel
 BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libcaptury-devel
 BuildRequires: libutempter-devel
@@ -83,14 +77,15 @@ BuildRequires: libXres-devel
 BuildRequires: lm_sensors-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
+BuildRequires: polkit-qt-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: qedje-devel
+BuildRequires: qedje-devel >= 0.4.0
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # would much rather these deps be elsewhere,
@@ -142,12 +137,10 @@ This package contains:
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth-devel = 4.1.4-1
-%else
+Obsoletes: PolicyKit-kde-devel < 4.2.85
+Provides:  PolicyKit-kde-devel = %{version}-%{release}
 Provides: solid-bluetooth-devel = 4.3-0.1
-%endif
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -155,11 +148,7 @@ Requires: kdelibs4-devel
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-%if 0%{?have_bluez3}
-Provides: solid-bluetooth = 4.1.4-1
-%else
 Provides: solid-bluetooth = 4.3-0.1
-%endif
 Requires: kdelibs4%{?_isa} >= %{version}
 Requires: %{name} = %{version}-%{release}
 %description libs
@@ -224,34 +213,20 @@ Requires: PyKDE4 >= %{version}
 # RH/Fedora-specific startkde changes
 %patch1 -p1 -b .redhat-startkde
 %patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .show-systemsettings
+%patch3 -p1 -b .show_systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
-pushd systemsettings
-%patch5 -p0 -b .rootprivs
-popd
-%patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
+%patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
-%patch12 -p1 -b .default_applets
+%patch12 -p1 -b .default-applets
 %patch13 -p1 -b .pykde4
-%patch14 -p1 -b .klipper-arora
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
-%patch16 -p1 -b .kde#165726
+%patch16 -p1 -b .showremainingtime
 
 # upstream patches
-%patch100 -p1 -b .AllowExternalPaths
-%if 0%{?have_bluez3}
-%patch102 -p1 -b .bluetooth-revert
-%else
-%patch101 -p0 -b .solid-bluetoothTrunkTo42
-%endif
-%patch103 -p1 -b .kde#180576
-%patch105 -p0 -b .desktopnumbers
-%patch106 -p1 -b .weather-dataengine-nm
-%patch107 -p0 -b .device-notifier-luks
 
 %build
 
@@ -288,6 +263,12 @@ ln -sf ../pics/users/%{default_face_icon
 popd
 
 
+%check
+for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
+  desktop-file-validate $f
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -318,7 +299,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
 %{_kde4_bindir}/kaccess                           
 %{_kde4_bindir}/kapplymousetheme                  
 %{_kde4_bindir}/kblankscrn.kss                    
@@ -343,13 +323,15 @@ fi
 %{_kde4_bindir}/ksystraycmd
 %{_kde4_bindir}/kwin*
 %{_kde4_bindir}/kxkb
-%{_kde4_bindir}/plasma
+%{_kde4_bindir}/polkit-kde-authorization
+%{_kde4_bindir}/plasma-desktop
 %{_kde4_bindir}/plasma-overlay
 %{_kde4_bindir}/plasmaengineexplorer
-%{_kde4_bindir}/plasmapkg
 %{_kde4_bindir}/plasmoidviewer
+%{_kde4_bindir}/plasmawallpaperviewer
 %{_kde4_bindir}/safestartkde
 %{_kde4_bindir}/setscheduler
+%{_kde4_bindir}/solid-action-desktop-gen
 %{_kde4_bindir}/solid-bluetooth
 %{_kde4_bindir}/solid-network
 %{_kde4_bindir}/solid-powermanagement
@@ -361,6 +343,7 @@ fi
 %{_kde4_appsdir}/kaccess/
 %{_kde4_appsdir}/kcminput/
 %{_kde4_appsdir}/kcmkeys/
+%{_kde4_appsdir}/kcmsolidactions/
 %{_kde4_appsdir}/kconf_update/
 %{_kde4_appsdir}/kcontrol/
 %{_kde4_appsdir}/kdisplay/
@@ -378,15 +361,11 @@ fi
 %{_kde4_appsdir}/plasma_scriptengine_ruby/
 %{_kde4_appsdir}/powerdevil/
 %{_kde4_appsdir}/solid/
-%if 0%{?have_bluez3}
-%{_kde4_appsdir}/solidfakebluetoothbackend/
-%endif
 %{_kde4_appsdir}/solidfakenetbackend/
 %{_kde4_appsdir}/systemsettings/
 
 %{_kde4_configdir}/background.knsrc
 %{_kde4_configdir}/colorschemes.knsrc
-%{_kde4_configdir}/klipperrc
 %{_kde4_configdir}/ksplash.knsrc
 %{_kde4_configdir}/ksysguard.knsrc
 %{_kde4_configdir}/plasma-overlayrc
@@ -394,11 +373,13 @@ fi
 %{_kde4_configdir}/wallpaper.knsrc
 
 %{_kde4_datadir}/kde4/services/*
+%exclude %{_kde4_datadir}/kde4/services/kdm.desktop
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/pop.wav
 %{_kde4_datadir}/autostart/klipper.desktop
 %{_kde4_datadir}/autostart/krunner.desktop
 %{_kde4_datadir}/autostart/plasma.desktop
+%{_kde4_datadir}/autostart/plasma-desktop.desktop
 %{_kde4_datadir}/applications/kde4/*
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
@@ -409,13 +390,17 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
+%{_kde4_docdir}/HTML/en/PolicyKit-kde/
 %{_kde4_docdir}/HTML/en/plasma/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_libdir}/kde4/classic_mode.so
 %{_kde4_libdir}/kde4/fontthumbnail.so
+%{_kde4_libdir}/kde4/icon_mode.so
 %{_kde4_libdir}/kde4/ion_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kcm_kdm.so
 %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/kfontviewpart.so
 %{_kde4_libdir}/kde4/kio_fonts.so
@@ -424,26 +409,30 @@ fi
 %{_kde4_libdir}/kde4/kwin*_*.so
 %{_kde4_libdir}/kde4/plasma_animator_default.so
 %{_kde4_libdir}/kde4/plasma_applet_*.so
-%{_kde4_libdir}/kde4/plasma_appletscript_*.so
-%{_kde4_libdir}/kde4/plasma_appletscriptengine_*.so
+%{_kde4_libdir}/kde4/plasma_appletscript_qedje.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_dashboard.so
+%{_kde4_libdir}/kde4/plasma_appletscriptengine_webapplet.so
 %{_kde4_libdir}/kde4/plasma_containment_*.so
 %{_kde4_libdir}/kde4/plasma_engine_*.so
+%{_kde4_libdir}/kde4/plasma-geolocation-gps.so
+%{_kde4_libdir}/kde4/plasma-geolocation-ip.so
 %{_kde4_libdir}/kde4/plasma_package*_*.so
-%{_kde4_libdir}/kde4/plasma_runnerscript_*.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_*.so
 %{_kde4_libdir}/kde4/solid_*.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
-%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 %{_kde4_libexecdir}/kcheckpass
 %{_kde4_libexecdir}/kcmdatetimehelper
 %{_kde4_libexecdir}/kfontprint
 %{_kde4_libexecdir}/kio_fonts_helper
 %{_kde4_libexecdir}/krootimage
-%{_kde4_libexecdir}/krunner_lock
+%{_kde4_libexecdir}/kscreenlocker
+%{_kde4_libexecdir}/polkit-kde-manager
 %{_kde4_libexecdir}/test_kcm_xinerama
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
+%{_kde4_libdir}/libkickoff.so
+%{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{_mandir}/man1/plasmaengineexplorer.1*
 # googlegadgets
 %exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
 %exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
@@ -457,20 +446,19 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
+%{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
-# CMake changes behaviour after cmake-2.6.2 
-%if "%{?_cmake_version}" > "2.6.2" 
-%{_kde4_libdir}/cmake/KDE4Workspace*
-%else
-%{_kde4_libdir}/KDE4Workspace*
-%endif
+%{_kde4_libdir}/cmake/KDE4Workspace-%{version}/
 %exclude %{_kde4_libdir}/libkdeinit*.so
+%exclude %{_kde4_libdir}/libkickoff.so
 %exclude %{_kde4_libdir}/libplasma_applet-system-monitor.so
+%exclude %{_kde4_libdir}/libsystemsettingsview.so
 
 %files wallpapers
 %defattr(-,root,root,-)
@@ -492,6 +480,7 @@ fi
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
 
+
 %files -n ksysguardd
 %defattr(-,root,root,-)
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
@@ -526,32 +515,85 @@ fi
 
 
 %changelog
-* Thu Jul  9 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-5
-- #510527 - Encrypted USB drives don't show up in KDE device notifier
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Than Ngo <than at redhat.com> - 4.3.0-4
+- respin
+
+* Mon Aug 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.0-3
+- show the remaining time in the battery plasmoid's popup (as in 4.2) (#515166)
+
+* Sat Aug 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- move designer plugins to -libs, fixes
+  Multilib conflicts for index.cache.bz2 (#515088)
+- tighten -libs deps, using %%{?_isa}
+- %%check: desktop-file-validate
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Mon Jul 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.98-3
+- backport forgotten method impl in Solid from 4.3 branch, r1000715
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
 
-* Wed Jul  1 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.4-4
+* Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Mon Jul 06 2009 Than Ngo <than at redhat.com> - 4.2.95-7
+- plasma-desktop crashes when closing/opening windows (upstream patch)
+
+* Fri Jul 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-6
+- add kde-plasma-networkmanagement to the default panel if installed
+
+* Wed Jul 01 2009 Michel Salim <salimma at fedoraproject.org> - 4.2.95-5
 - rebuild (google-gadgets)
 
-* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- fix Klipper crashes when destroying the popup (kde#165726)
+* Wed Jul 01 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-4
+- rebuild (libxklavier)
+
+* Mon Jun 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.95-3
+- omit a few kdm bits from main pkg (#508647)
+
+* Mon Jun 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.95-2
+- port and reapply rootprivs (#434824) patch (#508593)
+- fix internal version number (otherwise it mismatches with our file list)
 
-* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- make default_leonidas.png the default face icon on F11 (#503347)
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
 
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
+- startkde: make MALLOC_CHECK opt-in (default off)
 
-* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-6
+* Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-2
+- bump Obsoletes: PolicyKit-kde
+
+* Wed Jun 03 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-5
+- make default_leonidas.png the default face icon on F11
+
+* Sat May 30 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-4
+- -devel:  exclude libkickoff.so, libsystemsettingsview.so
+- drop old cmake crud
+
+* Fri May 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-3
 - omit/revert session-button patch (kde#194506,rh#502953)
+- drop unused knotificationitem-1 patch
 
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-5
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.85-2
 - upgrade path broken (F-11+), Obsoletes: guidance-power-manager (#502892)
+- drop < F-10 crud, have_bluez3
 
-* Mon May 18 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.3-4
-- fix TAB completion in krunner
-
-* Thu May 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.3-3
-- check for network availability through Solid/NM in the weather dataengine
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- 4.2.85
+- Obsoletes/Provides: PolicyKit-kde(-devel)
 
 * Wed May 06 2009 Than Ngo <than at redhat.com> - 4.2.3-2
 - Requires: oxygen-icon-theme >= 4.2.2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- sources	30 May 2009 10:58:08 -0000	1.31
+++ sources	5 Aug 2009 00:22:23 -0000	1.32
@@ -1 +1 @@
-72f90e1a61d94a5f66c0b3ce39b7b279  kdebase-workspace-4.2.4.tar.bz2
+e56f8af44df7bc8bfbc1de1ff1bf4414  kdebase-workspace-4.3.0.tar.bz2


--- kdebase-workspace-4.0.3-timedate-kcm.patch DELETED ---


--- kdebase-workspace-4.0.72-ck-shutdown.patch DELETED ---


--- kdebase-workspace-4.0.72-klipper-url.patch DELETED ---


--- kdebase-workspace-4.1.2-rootprivs.patch DELETED ---


--- kdebase-workspace-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdebase-workspace-4.2.0-bluetooth-revert.patch DELETED ---


--- kdebase-workspace-4.2.0-default_applets.patch DELETED ---


--- kdebase-workspace-4.2.0-kde#180576.patch DELETED ---


--- kdebase-workspace-4.2.0-show-systemsettings.patch DELETED ---


--- kdebase-workspace-4.2.1-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-redhat-startkde.patch DELETED ---


--- kdebase-workspace-4.2.2-kde#187699.patch DELETED ---


--- kdebase-workspace-4.2.3-weather-dataengine-nm.patch DELETED ---


--- kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch DELETED ---


--- kdebase-workspace-4.3.0-desktopnumbers.patch DELETED ---


--- kdebase-workspace-4.3.0-device-notifier-luks.patch DELETED ---


