rpms/kdebase-workspace/devel kdebase-workspace-4.3.75-show_systemsettings.patch, 1.2, 1.3 kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch, 1.2, 1.3 kdebase-workspace-4.4.0-classicmenu-logout.patch, 1.2, 1.3 kdebase-workspace-4.4.2-kdm_plymouth.patch, 1.2, 1.3 kdebase-workspace-4.4.80-kdm_plymouth081.patch, 1.2, 1.3 kdebase-workspace.spec, 1.416, 1.417 sources, 1.64, 1.65 kdebase-workspace-4.4.92-classicmenu-logout.patch, 1.1, NONE kdebase-workspace-4.4.92-kdm_plymouth.patch, 1.1, NONE kdebase-workspace-4.4.92-kdm_plymouth081.patch, 1.1, NONE kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch, 1.1, NONE kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Jul 7 19:57:26 UTC 2010
- Previous message: rpms/gpodder/F-13 .cvsignore, 1.30, 1.31 gpodder.spec, 1.51, 1.52 sources, 1.30, 1.31
- Next message: rpms/gpodder/F-13 gpodder.git-3301e92.patch, 1.1, NONE gpodder.git-7917c78ee8.patch, 1.1, NONE gpodder.git-b4886df.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28454
Modified Files:
kdebase-workspace.spec sources
Added Files:
kdebase-workspace-4.3.75-show_systemsettings.patch
kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
kdebase-workspace-4.4.0-classicmenu-logout.patch
kdebase-workspace-4.4.2-kdm_plymouth.patch
kdebase-workspace-4.4.80-kdm_plymouth081.patch
Removed Files:
kdebase-workspace-4.4.92-classicmenu-logout.patch
kdebase-workspace-4.4.92-kdm_plymouth.patch
kdebase-workspace-4.4.92-kdm_plymouth081.patch
kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch
kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch
Log Message:
tarball respin, restore old patches
kdebase-workspace-4.3.75-show_systemsettings.patch:
plasma/desktop/applets/kickoff/core/applicationmodel.cpp | 1 -
systemsettings/app/systemsettings.desktop | 1 +
systemsettings/app/systemsettings.desktop.orig |only
3 files changed, 1 insertion(+), 1 deletion(-)
Index: kdebase-workspace-4.3.75-show_systemsettings.patch
===================================================================
RCS file: kdebase-workspace-4.3.75-show_systemsettings.patch
diff -N kdebase-workspace-4.3.75-show_systemsettings.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.3.75-show_systemsettings.patch 7 Jul 2010 19:57:24 -0000 1.3
@@ -0,0 +1,26 @@
+diff -U5 -r kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/applicationmodel.cpp kdebase-workspace-4.3.75svn1048496.show_systemsettings/plasma/desktop/applets/kickoff/core/applicationmodel.cpp
+--- kdebase-workspace-4.3.75svn1048496/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2009-11-13 05:57:47.000000000 -0500
++++ kdebase-workspace-4.3.75svn1048496.show_systemsettings/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2009-11-21 04:55:21.000000000 -0500
+@@ -109,11 +109,10 @@
+ systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
+ primaryNamePolicy(ApplicationModel::GenericNamePrimary),
+ displayOrder(NameAfterDescription),
+ allowSeparators(_allowSeparators)
+ {
+- systemApplications = Kickoff::systemApplicationList();
+ }
+
+ ~ApplicationModelPrivate()
+ {
+ delete root;
+diff -U5 -r kdebase-workspace-4.3.75svn1048496/systemsettings/app/systemsettings.desktop kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app/systemsettings.desktop
+--- kdebase-workspace-4.3.75svn1048496/systemsettings/app/systemsettings.desktop 2009-09-23 15:21:33.000000000 -0400
++++ kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app/systemsettings.desktop 2009-11-21 04:55:21.000000000 -0500
+@@ -161,5 +161,6 @@
+ Name[zh_CN]=系统设置
+ Name[zh_TW]=系統設定
+
+ X-DBUS-StartupType=Unique
+ Categories=Qt;KDE;Settings;
++OnlyShowIn=KDE;
+Only in kdebase-workspace-4.3.75svn1048496.show_systemsettings/systemsettings/app: systemsettings.desktop.orig
kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch:
client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
===================================================================
RCS file: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
diff -N kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch 7 Jul 2010 19:57:25 -0000 1.3
@@ -0,0 +1,12 @@
+diff -up kdebase-workspace-4.3.80/kdm/backend/client.c.append kdebase-workspace-4.3.80/kdm/backend/client.c
+--- kdebase-workspace-4.3.80/kdm/backend/client.c.append 2009-11-02 06:01:32.000000000 -0600
++++ kdebase-workspace-4.3.80/kdm/backend/client.c 2009-12-11 13:16:49.047992973 -0600
+@@ -1182,7 +1182,7 @@ createClientLog( const char *log )
+ if (!(lname = expandMacros( log, macros )))
+ exit( 1 );
+ unlink( lname );
+- if ((lfd = open( lname, O_WRONLY|O_CREAT|O_EXCL, 0600 )) >= 0) {
++ if ((lfd = open( lname, O_WRONLY|O_CREAT|O_EXCL|O_APPEND, 0600 )) >= 0) {
+ dup2( lfd, 1 );
+ dup2( lfd, 2 );
+ close( lfd );
kdebase-workspace-4.4.0-classicmenu-logout.patch:
core/itemhandlers.cpp | 7 ++++++-
simpleapplet/simpleapplet.cpp | 4 ++++
simpleapplet/simpleapplet.h | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
Index: kdebase-workspace-4.4.0-classicmenu-logout.patch
===================================================================
RCS file: kdebase-workspace-4.4.0-classicmenu-logout.patch
diff -N kdebase-workspace-4.4.0-classicmenu-logout.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.4.0-classicmenu-logout.patch 7 Jul 2010 19:57:25 -0000 1.3
@@ -0,0 +1,65 @@
+diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/itemhandlers.cpp kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp
+--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-01-06 18:00:18.000000000 +0100
++++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/core/itemhandlers.cpp 2010-02-13 12:47:31.000000000 +0100
+@@ -110,7 +110,8 @@
+ QTimer::singleShot(0, this, SLOT(switchUser()));
+ return true;
+ } else if (m_logoutAction == "logout" || m_logoutAction == "logoutonly" ||
+- m_logoutAction == "restart" || m_logoutAction == "shutdown") {
++ m_logoutAction == "restart" || m_logoutAction == "shutdown" ||
++ m_logoutAction == "leave") {
+ // decouple dbus call, otherwise we'll run into a dead-lock
+ QTimer::singleShot(0, this, SLOT(logout()));
+ return true;
+@@ -163,6 +164,10 @@
+ type = KWorkSpace::ShutdownTypeReboot;
+ } else if (m_logoutAction == "shutdown") {
+ type = KWorkSpace::ShutdownTypeHalt;
++ } else if (m_logoutAction == "leave") {
++ // This one brings up the dialog, for use in the classic menu.
++ confirm = KWorkSpace::ShutdownConfirmYes;
++ type = KWorkSpace::ShutdownTypeDefault;
+ }
+
+ //FIXME: the proper fix is to implement the KWorkSpace methods for Windows
+diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp
+--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-01-06 18:00:18.000000000 +0100
++++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-02-13 12:49:23.000000000 +0100
+@@ -207,6 +207,7 @@
+ case Shutdown: return i18n("Shutdown");
+ case Logout: return i18n("Logout");
+ case Leave: return i18n("Leave");
++ case LeaveDialog: return i18n("Leave...");
+ }
+ return QString();
+ }
+@@ -232,6 +233,7 @@
+ case Shutdown: return "system-shutdown";
+ case Logout: return "system-log-out";
+ case Leave: return "system-shutdown";
++ case LeaveDialog: return "system-shutdown";
+ }
+ return QString();
+ }
+@@ -727,6 +729,8 @@
+ menuview->addAction(KIcon(d->viewIcon(LockScreen)), d->viewText(LockScreen))->setData(KUrl("leave:/lock"));
+ } else if(vtname == "Logout") {
+ menuview->addAction(KIcon(d->viewIcon(Logout)), d->viewText(Logout))->setData(KUrl("leave:/logout"));
++ } else if(vtname == "LeaveDialog") {
++ menuview->addAction(KIcon(d->viewIcon(LeaveDialog)), d->viewText(LeaveDialog))->setData(KUrl("leave:/leave"));
+ } else if(vtname == "Leave") {
+ Kickoff::LeaveModel *leavemodel = new Kickoff::LeaveModel(menuview);
+ leavemodel->updateModel();
+diff -ur kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h
+--- kdebase-workspace-4.4.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2009-09-16 13:40:52.000000000 +0200
++++ kdebase-workspace-4.4.0-classicmenu-logout/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h 2010-02-13 12:47:31.000000000 +0100
+@@ -59,7 +59,8 @@
+ Restart, ///< Restart Action
+ Shutdown, ///< Shutdown Action
+ Logout, ///< Logout Action
+- Leave ///< Leave Menu
++ Leave, ///< Leave Menu
++ LeaveDialog ///< Leave Dialog Action
+ };
+
+ /**
kdebase-workspace-4.4.2-kdm_plymouth.patch:
dm.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
Index: kdebase-workspace-4.4.2-kdm_plymouth.patch
===================================================================
RCS file: kdebase-workspace-4.4.2-kdm_plymouth.patch
diff -N kdebase-workspace-4.4.2-kdm_plymouth.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.4.2-kdm_plymouth.patch 7 Jul 2010 19:57:25 -0000 1.3
@@ -0,0 +1,55 @@
+diff -up kdebase-workspace-4.4.2/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.4.2/kdm/backend/dm.c
+--- kdebase-workspace-4.4.2/kdm/backend/dm.c.kdm_plymouth 2009-10-26 04:14:47.000000000 -0500
++++ kdebase-workspace-4.4.2/kdm/backend/dm.c 2010-04-13 09:04:27.722245637 -0500
+@@ -1330,6 +1330,36 @@ getBusyVTs( void )
+ return activeVTs;
+ }
+
++static int
++get_active_vt (void)
++{
++ int console_fd;
++ struct vt_stat console_state = { 0 };
++ console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++ if (console_fd < 0) {
++ goto out;
++ }
++ if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++ goto out;
++ }
++out:
++ if (console_fd >= 0) {
++ close (console_fd);
++ }
++ return console_state.v_active;
++}
++
++static int
++triggered_to_force_display_on_active_vt (void)
++{
++ int should_force_display_on_active_vt;
++ should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
++ if ( should_force_display_on_active_vt >= 0 )
++ close(should_force_display_on_active_vt);
++ unlink("/var/spool/gdm/force-display-on-active-vt");
++ return should_force_display_on_active_vt;
++}
++
+ static void
+ allocateVT( struct display *d )
+ {
+@@ -1339,6 +1369,14 @@ allocateVT( struct display *d )
+ if ((d->displayType & d_location) == dLocal &&
+ d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
+ {
++ if ( triggered_to_force_display_on_active_vt() >= 0 ) {
++ int vt;
++ vt = get_active_vt();
++ if (vt > 0) {
++ d->serverVT = vt;
++ return;
++ }
++ }
+ if (d->reqSrvVT && d->reqSrvVT < 16)
+ d->serverVT = d->reqSrvVT;
+ else {
kdebase-workspace-4.4.80-kdm_plymouth081.patch:
dm.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
dm.h | 4 ++
server.c | 5 ++
3 files changed, 122 insertions(+)
Index: kdebase-workspace-4.4.80-kdm_plymouth081.patch
===================================================================
RCS file: kdebase-workspace-4.4.80-kdm_plymouth081.patch
diff -N kdebase-workspace-4.4.80-kdm_plymouth081.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-workspace-4.4.80-kdm_plymouth081.patch 7 Jul 2010 19:57:25 -0000 1.3
@@ -0,0 +1,177 @@
+Description: Add support for smooth transition from Plymouth's bootsplash
+ If possible, KDM will try to deactivate plymouth, start X (with -nr) on
+ the active vt and leave the bootsplash on the screen until the graphical
+ login takes place.
+Forwarded: no
+Bug: https://bugs.launchpad.net/ubuntu/+source/kdebase-workspace/+bug/540177
+Author: Alberto Milone <alberto.milone at canonical.com>
+Bulletproof X bits (cf. kubuntu_33_kdm_bulletproof_x.diff) ripped out by
+Kevin Kofler <Kevin at tigcc.ticalc.org>
+
+
+diff -up kdebase-workspace-4.4.80/kdm/backend/dm.c.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/dm.c
+--- kdebase-workspace-4.4.80/kdm/backend/dm.c.kdm_plymouth 2010-03-03 19:26:52.000000000 +0100
++++ kdebase-workspace-4.4.80/kdm/backend/dm.c 2010-05-21 12:56:02.652091933 +0200
+@@ -1328,6 +1328,81 @@ getBusyVTs( void )
+ return activeVTs;
+ }
+
++static int
++get_active_vt (void)
++{
++ int console_fd;
++ struct vt_stat console_state = { 0 };
++ console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY);
++ if (console_fd < 0) {
++ goto out;
++ }
++ if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) {
++ goto out;
++ }
++out:
++ if (console_fd >= 0) {
++ close (console_fd);
++ }
++ return console_state.v_active;
++}
++
++static int
++plymouth_is_running (void)
++{
++ int status;
++ status = system ("/bin/plymouth --ping");
++
++ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
++}
++
++static int
++plymouth_has_active_vt (void)
++{
++ int status;
++ status = system ("/bin/plymouth --has-active-vt");
++
++ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
++}
++
++static int
++plymouth_prepare_for_transition (void)
++{
++ int status;
++ status = system ("/bin/plymouth deactivate");
++
++ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
++}
++
++int
++plymouth_quit_with_transition (void)
++{
++ int status;
++ status = system ("/bin/plymouth quit --retain-splash");
++
++ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
++}
++
++static int
++plymouth_quit_without_transition (void)
++{
++ int status;
++ status = system ("/bin/plymouth quit");
++
++ return WIFEXITED (status) && WEXITSTATUS (status) == 0;
++}
++
++static int
++triggered_to_force_display_on_active_vt (void)
++{
++ int should_force_display_on_active_vt;
++ should_force_display_on_active_vt=open("/var/spool/gdm/force-display-on-active-vt", O_RDONLY);
++ if ( should_force_display_on_active_vt >= 0 )
++ close(should_force_display_on_active_vt);
++ unlink("/var/spool/gdm/force-display-on-active-vt");
++ return should_force_display_on_active_vt;
++}
++
+ static void
+ allocateVT( struct display *d )
+ {
+@@ -1337,6 +1412,44 @@ allocateVT( struct display *d )
+ if ((d->displayType & d_location) == dLocal &&
+ d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
+ {
++
++ /* check for pymouth using old/deprecated method first */
++ if ( triggered_to_force_display_on_active_vt() >= 0 ) {
++ int vt;
++ vt = get_active_vt();
++ if (vt > 0) {
++ d->serverVT = vt;
++ return;
++ }
++ }
++
++ /* check for plymouth using newer methods */
++ d->plymouth_is_running = plymouth_is_running ();
++ if (d->plymouth_is_running) {
++ /* call plymouth deactivate */
++ plymouth_prepare_for_transition ();
++ if (plymouth_has_active_vt ()) {
++ /* plymouth was displaying a splash screen and has
++ * terminated leaving it on screen
++ */
++ int vt;
++ vt = get_active_vt ();
++ if (vt > 0) {
++ /* start the X server on the active vt */
++ d->serverVT = vt;
++ return;
++ }
++ }
++ else {
++ /* plymouth might have been running but did not display
++ * a splash screen.
++ */
++
++ /* call plymouth quit and start the X server as usual */
++ d->plymouth_is_running = !plymouth_quit_without_transition ();
++ }
++ }
++
+ if (d->reqSrvVT && d->reqSrvVT < 16)
+ d->serverVT = d->reqSrvVT;
+ else {
+diff -up kdebase-workspace-4.4.80/kdm/backend/dm.h.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/dm.h
+--- kdebase-workspace-4.4.80/kdm/backend/dm.h.kdm_plymouth 2010-04-15 10:59:31.000000000 +0200
++++ kdebase-workspace-4.4.80/kdm/backend/dm.h 2010-05-21 13:07:19.025216900 +0200
+@@ -292,6 +292,8 @@ struct display {
+ int authNum; /* number of authorizations */
+ char *authFile; /* file to store authorization in */
+ char *greeterAuthFile; /* file to store authorization for greeter in */
++
++ int plymouth_is_running; /* Plymouth's status */
+ };
+
+ #define d_location 1
+@@ -404,6 +406,8 @@ int anyDisplaysLeft( void );
+ void forEachDisplay( void (*f)( struct display * ) );
+ #ifdef HAVE_VTS
+ void forEachDisplayRev( void (*f)( struct display * ) );
++/* function for plymouth */
++int plymouth_quit_with_transition (void);
+ #endif
+ void removeDisplay( struct display *old );
+ struct display
+diff -up kdebase-workspace-4.4.80/kdm/backend/server.c.kdm_plymouth kdebase-workspace-4.4.80/kdm/backend/server.c
+--- kdebase-workspace-4.4.80/kdm/backend/server.c.kdm_plymouth 2010-05-16 12:04:29.000000000 +0200
++++ kdebase-workspace-4.4.80/kdm/backend/server.c 2010-05-21 12:56:02.653092289 +0200
+@@ -139,6 +139,11 @@ startServerSuccess()
+ struct display *d = startingServer;
+ d->serverStatus = ignore;
+ serverTimeout = TO_INF;
++ if (d->plymouth_is_running) {
++ debug( "Quitting Plymouth with transition\n" );
++ d->plymouth_is_running = !plymouth_quit_with_transition ();
++ debug ("Is Plymouth still running? %s\n", d->plymouth_is_running ? "yes" : "no");
++ }
+ debug( "X server ready, starting session\n" );
+ startDisplayP2( d );
+ }
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -p -r1.416 -r1.417
--- kdebase-workspace.spec 7 Jul 2010 18:58:51 -0000 1.416
+++ kdebase-workspace.spec 7 Jul 2010 19:57:25 -0000 1.417
@@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
Patch1: kdebase-workspace-4.4.80-redhat-startkde.patch
Patch2: kdebase-workspace-4.3.98-plasma-konsole.patch
-Patch3: kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch
+Patch3: kdebase-workspace-4.3.75-show_systemsettings.patch
%if 0%{?polkit_1}
Patch4: kdebase-workspace-4.3.95-ck-shutdown.patch
%else
@@ -44,11 +44,11 @@ Patch16: kdebase-workspace-4.4.80-batter
# allow adding a "Leave..." button which brings up the complete shutdown dialog
# to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
# default Leave submenu
-Patch17: kdebase-workspace-4.4.92-classicmenu-logout.patch
-Patch18: kdebase-workspace-4.4.92-kdm_plymouth.patch
+Patch17: kdebase-workspace-4.4.0-classicmenu-logout.patch
+Patch18: kdebase-workspace-4.4.2-kdm_plymouth.patch
# kubuntu kudos! bulletproof-X bits ripped out
-Patch19: kdebase-workspace-4.4.92-kdm_plymouth081.patch
-Patch20: kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch
+Patch19: kdebase-workspace-4.4.80-kdm_plymouth081.patch
+Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
# support the widgetStyle4 hack in the Qt KDE platform plugin
Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
# fix the Games menu in the classic menu mixing up Name and Description
@@ -288,7 +288,7 @@ Requires: akonadi
# RH/Fedora-specific startkde changes
%patch1 -p1 -b .redhat-startkde
%patch2 -p1 -b .plasma-konsole
-%patch3 -p1 -b .systemsettings_onlyshowin_kde
+%patch3 -p1 -b .show_systemsettings
# ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
%patch4 -p1 -b .ck-shutdown
%patch7 -p0 -b .krdb
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources 7 Jul 2010 17:27:35 -0000 1.64
+++ sources 7 Jul 2010 19:57:26 -0000 1.65
@@ -1 +1 @@
-35c13bd20bf26bdbd66b3b3ab974ad7a kdebase-workspace-4.4.92.tar.bz2
+8dc81a878fe23220bef7bf2d386779d9 kdebase-workspace-4.4.92.tar.bz2
--- kdebase-workspace-4.4.92-classicmenu-logout.patch DELETED ---
--- kdebase-workspace-4.4.92-kdm_plymouth.patch DELETED ---
--- kdebase-workspace-4.4.92-kdm_plymouth081.patch DELETED ---
--- kdebase-workspace-4.4.92-systemsettings_onlyshowin_kde.patch DELETED ---
--- kdebase-workspace-4.4.92-xsession_errors_O_APPEND.patch DELETED ---
- Previous message: rpms/gpodder/F-13 .cvsignore, 1.30, 1.31 gpodder.spec, 1.51, 1.52 sources, 1.30, 1.31
- Next message: rpms/gpodder/F-13 gpodder.git-3301e92.patch, 1.1, NONE gpodder.git-7917c78ee8.patch, 1.1, NONE gpodder.git-b4886df.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list