rpms/kdebase-workspace/devel kdebase-workspace-4.2.85-ck-shutdown.patch, NONE, 1.1 kdebase-workspace-4.2.85-klipper-url.patch, NONE, 1.1 kdebase-workspace-4.2.85-plasma-konsole.patch, NONE, 1.1 kdebase-workspace-4.2.85-redhat-startkde.patch, NONE, 1.1 kdebase-workspace-4.2.85-show-systemsettings.patch, NONE, 1.1 kdelibs-4.2.85-kde149705.patch, NONE, 1.1 kdelibs-4.2.85-libexecdir.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 kdebase-workspace.spec, 1.218, 1.219 sources, 1.35, 1.36 kdebase-workspace-4.0.72-ck-shutdown.patch, 1.1, NONE kdebase-workspace-4.0.72-klipper-url.patch, 1.3, NONE kdebase-workspace-4.1.2-rootprivs.patch, 1.1, NONE kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.2, NONE kdebase-workspace-4.2.0-kde#180576.patch, 1.3, NONE kdebase-workspace-4.2.0-show-systemsettings.patch, 1.1, NONE kdebase-workspace-4.2.1-plasma-konsole.patch, 1.1, NONE kdebase-workspace-4.2.1-redhat-startkde.patch, 1.1, NONE kdebase-workspace-4.2.2-kde#187699.patch, 1.2, NONE kdebase-workspace-4.2.3-plasma-notifications.patch, 1.1, NONE kdebase-workspace-4.3.0-desktopnumbers.patch, 1.1, NONE solid-bluetoothTrunkTo42.diff, 1.2, NONE
Than Ngo
than at fedoraproject.org
Tue May 12 13:08:26 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21046
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.85-plasma-konsole.patch
kdebase-workspace-4.2.85-redhat-startkde.patch
kdebase-workspace-4.2.85-show-systemsettings.patch
kdelibs-4.2.85-kde149705.patch kdelibs-4.2.85-libexecdir.patch
Removed Files:
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.2.0-bluetooth-revert.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-plasma-notifications.patch
kdebase-workspace-4.3.0-desktopnumbers.patch
solid-bluetoothTrunkTo42.diff
Log Message:
4.2.85
kdebase-workspace-4.2.85-ck-shutdown.patch:
--- 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:
--- 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.85-plasma-konsole.patch:
--- NEW FILE kdebase-workspace-4.2.85-plasma-konsole.patch ---
diff -up kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.cpp.plasma-konsole kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.cpp
--- kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.cpp.plasma-konsole 2009-04-28 15:46:20.000000000 +0200
+++ kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.cpp 2009-05-11 22:34:34.000000000 +0200
@@ -41,6 +41,7 @@
#include <KRun>
#include <KStandardDirs>
#include <KWindowSystem>
+#include <ktoolinvocation.h>
#include <Plasma/Corona>
#include <Plasma/Animator>
@@ -64,6 +65,7 @@ DefaultDesktop::DefaultDesktop(QObject *
m_lockDesktopAction(0),
m_appletBrowserAction(0),
m_addPanelAction(0),
+ m_runKonsoleAction(0),
m_runCommandAction(0),
m_lockScreenAction(0),
m_logoutAction(0),
@@ -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")) {
@@ -255,6 +262,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);
connect(m_runCommandAction, SIGNAL(triggered(bool)), this, SLOT(runCommand()));
m_runCommandAction->setIcon(KIcon("system-run"));
@@ -277,6 +288,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.85/plasma/containments/desktop/desktop.h.plasma-konsole kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.h
--- kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.h.plasma-konsole 2009-04-05 22:00:17.000000000 +0200
+++ kdebase-workspace-4.2.85/plasma/containments/desktop/desktop.h 2009-05-11 22:26:07.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.85-redhat-startkde.patch:
--- NEW FILE kdebase-workspace-4.2.85-redhat-startkde.patch ---
diff -up kdebase-workspace-4.2.85/startkde.cmake.redhat-startkde kdebase-workspace-4.2.85/startkde.cmake
--- kdebase-workspace-4.2.85/startkde.cmake.redhat-startkde 2009-04-28 15:46:21.000000000 +0200
+++ kdebase-workspace-4.2.85/startkde.cmake 2009-05-11 22:25:07.000000000 +0200
@@ -22,15 +22,15 @@ 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
@@ -40,22 +40,6 @@ unset DYLD_FORCE_FLAT_NAMESPACE
MALLOC_CHECK_=2
export MALLOC_CHECK_
-# 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
@@ -93,6 +77,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
@@ -213,8 +204,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
@@ -427,7 +419,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.2.85-show-systemsettings.patch:
--- NEW FILE kdebase-workspace-4.2.85-show-systemsettings.patch ---
diff -up kdebase-workspace-4.2.85/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings kdebase-workspace-4.2.85/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.2.85/plasma/applets/kickoff/core/applicationmodel.cpp.show-systemsettings 2009-04-28 15:46:21.000000000 +0200
+++ kdebase-workspace-4.2.85/plasma/applets/kickoff/core/applicationmodel.cpp 2009-05-11 22:37:12.000000000 +0200
@@ -109,7 +109,6 @@ public:
primaryNamePolicy(ApplicationModel::GenericNamePrimary),
allowSeparators(_allowSeparators)
{
- systemApplications = Kickoff::systemApplicationList();
}
~ApplicationModelPrivate()
diff -up kdebase-workspace-4.2.85/systemsettings/app/systemsettings.desktop.show-systemsettings kdebase-workspace-4.2.85/systemsettings/app/systemsettings.desktop
--- kdebase-workspace-4.2.85/systemsettings/app/systemsettings.desktop.show-systemsettings 2009-05-11 22:38:43.000000000 +0200
+++ kdebase-workspace-4.2.85/systemsettings/app/systemsettings.desktop 2009-05-11 22:39:06.000000000 +0200
@@ -157,3 +157,4 @@ Name[zh_TW]=系統è¨å®š
X-DBUS-StartupType=Unique
Categories=Qt;KDE;Settings;
+OnlyShowIn=KDE;
kdelibs-4.2.85-kde149705.patch:
--- NEW FILE kdelibs-4.2.85-kde149705.patch ---
diff -up kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-4.2.85/kdeui/icons/kicontheme.cpp
--- kdelibs-4.2.85/kdeui/icons/kicontheme.cpp.kde149705 2009-04-15 12:26:44.000000000 +0200
+++ kdelibs-4.2.85/kdeui/icons/kicontheme.cpp 2009-05-11 16:01:29.000000000 +0200
@@ -525,7 +525,7 @@ QString KIconTheme::current()
}
KConfigGroup cg(KGlobal::config(), "Icons");
- *_theme = cg.readEntry("Theme", defaultThemeName());
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
if ( *_theme == QLatin1String("hicolor") ) {
*_theme = defaultThemeName();
}
diff -up kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp
--- kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp.kde149705 2009-03-27 15:47:33.000000000 +0100
+++ kdelibs-4.2.85/kdeui/kernel/kglobalsettings.cpp 2009-05-11 16:00:06.000000000 +0200
@@ -856,7 +856,7 @@ void KGlobalSettings::Private::applyGUIS
if (kde_overrideStyle.isEmpty()) {
const QString &defaultStyle = KStyle::defaultStyle();
const KConfigGroup pConfig(KGlobal::config(), "General");
- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
+ const QString &styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
if (styleStr.isEmpty() ||
// check whether we already use the correct style to return then
diff -up kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 kdelibs-4.2.85/kutils/kdeglobals.kcfg
--- kdelibs-4.2.85/kutils/kdeglobals.kcfg.kde149705 2009-04-15 12:26:45.000000000 +0200
+++ kdelibs-4.2.85/kutils/kdeglobals.kcfg 2009-05-11 16:00:06.000000000 +0200
@@ -24,6 +24,10 @@
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
<default>keramik</default>
</entry>
+ <entry key="widgetStyle4" type="String" >
+ <label>Widget style to use for KDE 4</label>
+ <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
+ </entry>
<entry key="windowBackground" type="String" />
<entry key="windowForeground" type="String" />
<entry key="UseSystemBell" type="Bool" >
kdelibs-4.2.85-libexecdir.patch:
--- NEW FILE kdelibs-4.2.85-libexecdir.patch ---
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2009-05-06 12:14:38.000000000 +0200
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp 2009-05-11 16:08:13.000000000 +0200
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
index+=2;
}
- addResourceType("exe", "lib", "kde4/libexec", true );
+ addResourceType("exe", 0, "libexec/kde4", true );
addResourceDir("home", QDir::homePath(), false);
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 13:08:57.000000000 +0200
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp 2009-05-11 16:06:16.000000000 +0200
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
if (strcmp("lib", type) == 0)
return QString::fromLatin1(LIB_INSTALL_DIR "/");
if (strcmp("libexec", type) == 0)
- return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
+ return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
if (strcmp("locale", type) == 0)
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
break;
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2009-02-27 13:31:32.000000000 +0100
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp 2009-05-11 16:06:16.000000000 +0200
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
#define KIOSLAVE "bin/kioslave.exe"
#else
#define EXT ""
-#define KIOSLAVE "kde4/libexec/kioslave"
+#define KIOSLAVE "libexec/kde4/kioslave"
#endif
+
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
QVERIFY( !bin.isEmpty() );
QVERIFY( bin.endsWith( KIOSLAVE ) );
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
// findExe with a result in libexec
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
QVERIFY( !lnusertemp.isEmpty() );
- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
+ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) );
#endif
// Check the "exe" resource too
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 13:08:08.000000000 +0200
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp 2009-05-11 16:06:16.000000000 +0200
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
if (!kdeinit.isEmpty()) {
QVERIFY(!kmailservice.isEmpty());
- QVERIFY(kmailservice.contains("kde4/libexec"));
+ QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
}
QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore 30 Mar 2009 18:20:48 -0000 1.29
+++ .cvsignore 12 May 2009 13:08:25 -0000 1.30
@@ -1 +1,2 @@
kdebase-workspace-4.2.2.tar.bz2
+kdebase-workspace-4.2.85.tar.bz2
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -p -r1.218 -r1.219
--- kdebase-workspace.spec 4 May 2009 20:18:51 -0000 1.218
+++ kdebase-workspace.spec 12 May 2009 13:08:26 -0000 1.219
@@ -6,25 +6,23 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
-Version: 4.2.2
+Version: 4.2.85
-Release: 6%{?dist}
+Release: 1%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
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
+Patch1: kdebase-workspace-4.2.85-redhat-startkde.patch
+Patch2: kdebase-workspace-4.2.85-plasma-konsole.patch
+Patch3: kdebase-workspace-4.2.85-show-systemsettings.patch
+Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
Patch6: kdebase-workspace-4.0.3-timedate-kcm.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
Patch9: kdebase-workspace-4.1.80-session-button.patch
Patch11: kdebase-workspace-4.1.96-font.patch
Patch12: kdebase-workspace-4.2.0-default_applets.patch
@@ -34,21 +32,6 @@ Patch15: kdebase-workspace-4.2.0-kio_sys
# upstream patches:
# 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
-# http://bugs.kde.org/187699, Calendar standalone plasmoid on Desktop using 100% of CPU
-Patch106: kdebase-workspace-4.2.2-kde#187699.patch
-#Â #497657 - kpackagekit/kopete notification misrendering/missing buttons with qt-4.5.1
-#Â (https://bugs.kde.org/show_bug.cgi?id=190786)
-Patch107: kdebase-workspace-4.2.3-plasma-notifications.patch
# FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
@@ -86,6 +69,8 @@ BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
BuildRequires: python-devel
BuildRequires: qedje-devel
+BuildRequires: polkit-qt-devel
+BuildRequires: kdelibs-experimental-devel
# used for the Logitech mouse KCM, disabled until #399931 is fixed
# BuildRequires: libusb-devel
@@ -221,9 +206,6 @@ Requires: PyKDE4 >= %{version}
%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
@@ -231,21 +213,10 @@ popd
%patch11 -p1 -b .font
%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
# 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 .kde#187699
-%patch107 -p1 -b .plasma-notifications
%build
@@ -312,7 +283,6 @@ fi
%files
%defattr(-,root,root,-)
%doc COPYING README
-%config(noreplace) %{_kde4_sysconfdir}/systemsettingsrc
%{_kde4_bindir}/kaccess
%{_kde4_bindir}/kapplymousetheme
%{_kde4_bindir}/kblankscrn.kss
@@ -337,11 +307,12 @@ fi
%{_kde4_bindir}/ksystraycmd
%{_kde4_bindir}/kwin*
%{_kde4_bindir}/kxkb
-%{_kde4_bindir}/plasma
+%{_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-bluetooth
@@ -393,6 +364,7 @@ fi
%{_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
@@ -520,9 +492,16 @@ fi
%changelog
-* Tue Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-6
+* Mon May 11 2009 Than Ngo <than at redhat.com> 4.2.85-2
+- 4.2.85
+
+* Wed May 06 2009 Than Ngo <than at redhat.com> - 4.2.3-2
+- Requires: oxygen-icon-theme >= 4.2.2
- fix oxygen-cursor-themes noarch'ness
+* Sun May 03 2009 Than Ngo <than at redhat.com> - 4.2.3-1
+- 4.2.3
+
* Tue Apr 28 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-5
- #497657 - kpackagekit/kopete notification misrendering/missing
buttons with qt-4.5.1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources 30 Mar 2009 18:20:48 -0000 1.35
+++ sources 12 May 2009 13:08:26 -0000 1.36
@@ -1 +1 @@
-ac494815044eefc3a181488871225eda kdebase-workspace-4.2.2.tar.bz2
+fb83bd9cb331c7ef225d4c1ec2eb9a80 kdebase-workspace-4.2.85.tar.bz2
--- 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.2.0-bluetooth-revert.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-plasma-notifications.patch DELETED ---
--- kdebase-workspace-4.3.0-desktopnumbers.patch DELETED ---
--- solid-bluetoothTrunkTo42.diff DELETED ---
More information about the fedora-extras-commits
mailing list