rpms/kdebase/devel kdebase-3.5.6-kdm-alternatebackground.patch, NONE, 1.1 kderc, NONE, 1.1 .cvsignore, 1.55, 1.56 kdebase.spec, 1.246, 1.247 sources, 1.76, 1.77
Than Ngo (than)
fedora-extras-commits at redhat.com
Tue May 15 14:16:14 UTC 2007
Author: than
Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2426
Modified Files:
.cvsignore kdebase.spec sources
Added Files:
kdebase-3.5.6-kdm-alternatebackground.patch kderc
Log Message:
- enable userlist by default in KDM, bz#239701
- own %%{_datadir}/apps/kdm/faces, bz#239694
- remove unneeded Rq on kdelibs-devel
kdebase-3.5.6-kdm-alternatebackground.patch:
--- NEW FILE kdebase-3.5.6-kdm-alternatebackground.patch ---
diff -ur kdebase-3.5.6/kdm/kfrontend/kgapp.cpp kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgapp.cpp
--- kdebase-3.5.6/kdm/kfrontend/kgapp.cpp 2006-05-22 20:13:07.000000000 +0200
+++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgapp.cpp 2007-05-11 15:26:03.000000000 +0200
@@ -40,6 +40,7 @@
#include <qtimer.h>
#include <qcursor.h>
#include <qpalette.h>
+#include <qcolor.h>
#include <stdlib.h> // free(), exit()
#include <unistd.h> // alarm()
@@ -145,6 +146,8 @@
if (!_colorScheme.isEmpty()) {
KSimpleConfig config( _colorScheme, true );
config.setGroup( "Color Scheme" );
+ flagAlternateBackground = true;
+ gAlternateBackground = config.readColorEntry( "alternateBackground" );
app.setPalette( app.createApplicationPalette( &config, 7 ) );
}
diff -ur kdebase-3.5.6/kdm/kfrontend/kgreeter.cpp kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.cpp
--- kdebase-3.5.6/kdm/kfrontend/kgreeter.cpp 2006-10-01 19:32:15.000000000 +0200
+++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.cpp 2007-05-11 15:26:44.000000000 +0200
@@ -54,6 +54,7 @@
#include <qtooltip.h>
#include <qaccel.h>
#include <qeventloop.h>
+#include <qcolor.h>
#include <pwd.h>
#include <grp.h>
@@ -63,12 +64,17 @@
#include <X11/Xlib.h>
+bool flagAlternateBackground;
+QColor gAlternateBackground;
+
class UserListView : public KListView {
public:
UserListView( QWidget *parent = 0, const char *name = 0 )
: KListView( parent, name )
, cachedSizeHint( -1, 0 )
{
+ if (flagAlternateBackground)
+ setAlternateBackground( gAlternateBackground );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
header()->hide();
addColumn( QString::null );
diff -ur kdebase-3.5.6/kdm/kfrontend/kgreeter.h kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.h
--- kdebase-3.5.6/kdm/kfrontend/kgreeter.h 2005-10-10 17:04:31.000000000 +0200
+++ kdebase-3.5.6-kdm-alternatebackground/kdm/kfrontend/kgreeter.h 2007-05-11 15:25:28.000000000 +0200
@@ -26,6 +26,8 @@
#ifndef KGREETER_H
#define KGREETER_H
+#include <qcolor.h>
+
#include "kgverify.h"
#include "kgdialog.h"
@@ -42,6 +44,9 @@
class QPopupMenu;
class QListViewItem;
+extern bool flagAlternateBackground;
+extern QColor gAlternateBackground;
+
struct SessType {
QString name, type;
bool hid;
--- NEW FILE kderc ---
[General]
activeFont=Sans,10,-1,5,50,0,0,0,0,0
background=230,230,230
fixed=Monospace,10,-1,5,50,0,0,0,1,0
font=Sans,10,-1,5,50,0,0,0,0,0
foreground=0,0,0
menuFont=Sans,10,-1,5,50,0,0,0,0,0
selectBackground=76,89,166
selectForeground=255,255,255
taskbarFont=Sans,10,-1,5,50,0,0,0,0,0
toolBarFont=Sans,10,-1,5,50,0,0,0,0,0
windowBackground=255,255,255
windowForeground=0,0,0
StandardFont=Sans,10,-1,5,50,0,0,0,0,0
[DirWatch]
NFSPollInterval=5000
PollInterval=500
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore 22 Mar 2007 18:42:13 -0000 1.55
+++ .cvsignore 15 May 2007 14:15:40 -0000 1.56
@@ -29,3 +29,4 @@
kde-redhat-config-3.5-fc5-0.5.tar.bz2
kdebase-3.5.6.tar.bz2
kde-redhat-config-3.5-fc5-0.6.tar.bz2
+kde-redhat-config-3.5-fc7-1.tar.bz2
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- kdebase.spec 30 Apr 2007 13:08:52 -0000 1.246
+++ kdebase.spec 15 May 2007 14:15:40 -0000 1.247
@@ -17,7 +17,7 @@
Summary: K Desktop Environment - core files
Name: kdebase
Version: 3.5.6
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 6
Url: http://www.kde.org
Group: User Interface/Desktops
@@ -27,7 +27,7 @@
Source1: konsole.desktop
Source2: KDE.session.gnome
Source3: kde.desktop
-Source4: kde-redhat-config-3.5-fc5-0.6.tar.bz2
+Source4: kde-redhat-config-3.5-fc7-1.tar.bz2
Source5: kde-np
Source6: logrotate-kdm
Source7: mailsettings.cc
@@ -35,6 +35,7 @@
Source9: cr16-app-package_games_kids.png
Source10: cr32-app-package_games_kids.png
Source11: cr48-app-package_games_kids.png
+Source12: kderc
Patch0: kdebase-3.5.5-redhat-pam.patch
Patch1: kdebase-3.5.6-1-redhat-startkde.patch
@@ -59,6 +60,7 @@
Patch25: kdebase-3.5.4-konqueror-shortcut.patch
Patch26: kdebase-3.5.5-suspend.patch
Patch27: kdebase-3.5.6-consolekit-kdm.patch
+Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
Provides: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
@@ -159,7 +161,6 @@
%package extras
Summary: Extras packages from kdebase
Requires: %{name} = %{epoch}:%{version}-%{release}.%{_arch}
-Requires: kdelibs-devel >= %{version}
Group: User Interface/Desktops
%description extras
@@ -194,6 +195,7 @@
%patch25 -p1 -b .konqueror-shortcut
%patch26 -p1 -b .suspend
%patch27 -p1 -b .consolekit
+%patch28 -p1 -b .kdm-alternatebackground
%if %{rhel}
rm -rf kdeprint/kdeprintfax
@@ -312,26 +314,11 @@
ln -fs ../../X11/xinit/Xsession Xsession
popd
-cat >>%{buildroot}/etc/kderc <<EOF
-[General]
-activeFont=Sans,10,-1,5,50,0,0,0,0,0
-background=230,230,230
-fixed=Monospace,10,-1,5,50,0,0,0,1,0
-font=Sans,10,-1,5,50,0,0,0,0,0
-foreground=0,0,0
-menuFont=Sans,10,-1,5,50,0,0,0,0,0
-selectBackground=76,89,166
-selectForeground=255,255,255
-taskbarFont=Sans,10,-1,5,50,0,0,0,0,0
-toolBarFont=Sans,10,-1,5,50,0,0,0,0,0
-windowBackground=255,255,255
-windowForeground=0,0,0
-StandardFont=Sans,10,-1,5,50,0,0,0,0,0
-
-[DirWatch]
-NFSPollInterval=5000
-PollInterval=500
-EOF
+# own %{_datadir}/apps/kdm/faces
+mkdir -p %{buildroot}%{_datadir}/apps/kdm/faces
+
+# kde resource
+install -m 644 %{SOURCE12} %{buildroot}/etc/
# Make symlinks relative
cd %{buildroot}/%{_docdir}/HTML/en
@@ -595,6 +582,7 @@
%{_datadir}/sounds
%{_datadir}/templates
%{_datadir}/wallpapers
+%{_datadir}/apps/kdm/faces
%files devel
%defattr(-,root,root)
@@ -611,6 +599,11 @@
%exclude %{_libdir}/libkdeinit_*.so
%changelog
+* Tue May 15 2007 Than Ngo <than at redhat.com> - 6:3.5.6-7.fc7
+- enable userlist by default in KDM, bz#239701
+- own %%{_datadir}/apps/kdm/faces, bz#239694
+- remove unneeded Rq on kdelibs-devel
+
* Mon Apr 23 2007 Than Ngo <than at redhat.com> - 6:3.5.6-6.fc7
- apply patch KDM to support ConsoleKit, thanks to Kevin Kofler and
S.Çağlar Onur, #228111
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- sources 22 Mar 2007 18:42:13 -0000 1.76
+++ sources 15 May 2007 14:15:40 -0000 1.77
@@ -1,2 +1,2 @@
a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2
-c5097bf3bf10849a6df9becd50d7cb66 kde-redhat-config-3.5-fc5-0.6.tar.bz2
+d52f08756a8d3e9df478506bd258a4d8 kde-redhat-config-3.5-fc7-1.tar.bz2
More information about the fedora-extras-commits
mailing list