Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1248 mails)

< Previous Next >
commit kdebase4-workspace for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 27 Apr 2010 14:58:29 +0200
  • Message-id: <20100427125830.0163C202B7@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory
checked in at Tue Apr 27 14:58:29 CEST 2010.



--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-04-01
16:09:20.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-04-27
14:57:19.794044000 +0200
@@ -1,0 +2,12 @@
+Tue Apr 27 07:20:37 UTC 2010 - aj@xxxxxxx
+
+- Fix some obsoletes/provides to not be self-obsoletes.
+- Fix branding requires to require 11.3 on 11.3.
+
+-------------------------------------------------------------------
+Thu Apr 15 09:41:05 UTC 2010 - llunak@xxxxxxxxxx
+
+- make shutdown/restart work in logout dialog also with GDM
+ (bnc#593269, bnc#331569)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
python-kdebase4.changes: same change

calling whatdependson for head-i586


New:
----
kdebase-workspace-4.3.95-ck-shutdown.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.ZQWQsu/_old 2010-04-27 14:57:33.000000000 +0200
+++ /var/tmp/diff_new_pack.ZQWQsu/_new 2010-04-27 14:57:33.000000000 +0200
@@ -30,7 +30,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.4.2
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch

++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.ZQWQsu/_old 2010-04-27 14:57:33.000000000 +0200
+++ /var/tmp/diff_new_pack.ZQWQsu/_new 2010-04-27 14:57:33.000000000 +0200
@@ -40,7 +40,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.4.2
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
Source1: rcksysguardd
Source2: titlebar_decor.png
@@ -93,14 +93,18 @@
Patch200: plasma-solid_hddtemp-no_timer.diff
Patch201: plasma-notifications-kill-timer.diff
Patch202: bnc584223.diff
+Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch
Requires: kde4-kgreeter-plugins = %version
%kde4_runtime_requires
%if %suse_version == 1110
Requires: %name-branding = 11.1
%endif
-%if %suse_version > 1110
+%if %suse_version == 1120
Requires: %name-branding = 11.2
%endif
+%if %suse_version > 1120
+Requires: %name-branding = 11.3
+%endif
Recommends: kdebase4-SuSE kwin plasma-addons plasmoid-quickaccess
python-kdebase4
%if %suse_version < 1100
Recommends: kdebase4-workspace-ksysguardd = %version
@@ -114,14 +118,14 @@
%define debug_package_requires %name = %version-%release kdelibs4-debuginfo
Provides: kdebase3:/opt/kde3/bin/kicker
Provides: powerdevil = 1.4.1
-Obsoletes: powerdevil <= 1.4.1
+Obsoletes: powerdevil < 1.4.1
Obsoletes: powerdevil-lang <= 1.4.1
Obsoletes: kpowersave <= 0.7.3_svn3167
Obsoletes: kpowersave-lang <= 0.7.3_svn3167
Provides: kde4-plasmoid-quicklauncher = 0.4
-Obsoletes: kde4-plasmoid-quicklauncher <= 0.4
+Obsoletes: kde4-plasmoid-quicklauncher < 0.4
Provides: PolicyKit-kde = 0.2.0
-Obsoletes: PolicyKit-kde <= 0.2.0
+Obsoletes: PolicyKit-kde < 0.2.0
Obsoletes: PolicyKit-kde-lang < 11.2

%description
@@ -194,6 +198,7 @@
%patch200 -p1
%patch201 -p1
%patch202 -p1
+%patch203 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png

%build
@@ -261,9 +266,12 @@
%if %suse_version == 1110
Provides: %{name}-branding = 11.1
%endif
-%if %suse_version > 1110
+%if %suse_version == 1120
Provides: %{name}-branding = 11.2
%endif
+%if %suse_version > 1120
+Provides: %{name}-branding = 11.3
+%endif
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(kdebase4-workspace:branding-upstream)
%endif
@@ -295,9 +303,12 @@
%if %suse_version == 1110
Provides: kdm-branding = 11.1
%endif
-%if %suse_version > 1110
+%if %suse_version == 1120
Provides: kdm-branding = 11.2
%endif
+%if %suse_version > 1120
+Provides: kdm-branding = 11.3
+%endif
Conflicts: otherproviders(kdm-branding)
Supplements: packageand(kdm:branding-upstream)
%endif
@@ -330,7 +341,7 @@
Group: System/GUI/KDE
Summary: KDE base package: ksysguard daemon
Provides: kdebase3-ksysguardd = 3.5.90
-Obsoletes: kdebase3-ksysguardd <= 3.5.90
+Obsoletes: kdebase3-ksysguardd < 3.5.90
Provides: kdebase3-ksysguardd = 3.5.1
PreReq: %insserv_prereq

@@ -407,9 +418,12 @@
%if %suse_version == 1110
Requires: %{name}-branding = 11.1
%endif
-%if %suse_version >1110
+%if %suse_version == 1120
Requires: %{name}-branding = 11.2
%endif
+%if %suse_version >1120
+Requires: %{name}-branding = 11.3
+%endif
Provides: kdebase3:/opt/kde3/bin/kwin
Provides: kde4-kwin = 4.3.0
Obsoletes: kde4-kwin < 4.3.0
@@ -509,9 +523,12 @@
%if %suse_version == 1110
Requires: kdm-branding = 11.1
%endif
-%if %suse_version > 1110
+%if %suse_version == 1120
Requires: kdm-branding = 11.2
%endif
+%if %suse_version > 1120
+Requires: kdm-branding = 11.3
+%endif
%if %suse_version > 1030
Requires: ConsoleKit-x11 xorg-x11-server
%endif
@@ -519,7 +536,7 @@
Requires: pam-config
%kde4_runtime_requires
Provides: kdebase3-kdm = 3.5.1
-Obsoletes: kdebase3-kdm <= 3.5.1
+Obsoletes: kdebase3-kdm < 3.5.1
Provides: kde4-kdm = 4.3.0
Obsoletes: kde4-kdm < 4.3.0


++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.ZQWQsu/_old 2010-04-27 14:57:33.000000000 +0200
+++ /var/tmp/diff_new_pack.ZQWQsu/_new 2010-04-27 14:57:33.000000000 +0200
@@ -29,7 +29,7 @@
Summary: Python bindings for KDE 4 desktop shell
Url: http://www.kde.org/
Version: 4.4.2
-Release: 1
+Release: 2
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: python-kde4 = %{version}

++++++ kdebase-workspace-4.3.95-ck-shutdown.patch ++++++
Subject: Make Restart/Shutdown available in logout dialog also with GDM
From: Fedora package
Patch-upstream: no
Bug: bnc#593269, bnc#331569

diff -ur kdebase-workspace-4.3.95/libs/kworkspace/kdisplaymanager.cpp
kdebase-workspace-4.3.95-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp
--- kdebase-workspace-4.3.95/libs/kworkspace/kdisplaymanager.cpp
2009-04-28 15:46:11.000000000 +0200
+++ kdebase-workspace-4.3.95-ck-shutdown/libs/kworkspace/kdisplaymanager.cpp
2010-01-30 17:31:58.000000000 +0100
@@ -26,6 +26,7 @@
#include <QtDBus/QtDBus>

#include <QRegExp>
+#include <QLatin1String>

#include <X11/Xauth.h>
#include <X11/Xlib.h>
@@ -85,6 +86,7 @@
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,23 @@
bool
KDisplayManager::canShutdown()
{
+ if (DMType == NoDM) {
+ // No DM or newest GDM running, we'll try shutting down through
ConsoleKit.
+ 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 );
+ if (!consoleKit.isValid())
+ return false;
+ // Unfortunately, at this point we don't know whether we should
be querying
+ // CanStop or CanRestart. Let's do what the code below does and
just use CanStop.
+ QDBusReply<bool> canStop = consoleKit.call( QLatin1String(
"CanStop" ) );
+ return (canStop.isValid() && canStop.value());
+ }
+
if (DMType == OldKDM)
return strstr( ctl, ",maysd" ) != 0;

@@ -205,6 +224,21 @@
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;



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread