rpms/kdebase/FC-3 kdebase-3.3.92-fstab.patch, NONE, 1.1 kdebase-3.3.92-kpersonalizer.patch, NONE, 1.1 kdebase-3.3.92-servicebutton-saveas.patch, NONE, 1.1 kdebase-3.3.92-vroot.patch, NONE, 1.1 kdebase-3.4.0-config.patch, NONE, 1.1 kdebase-3.4.0-fonts.patch, NONE, 1.1 kdebase-3.4.0-kdesktop-konsole.patch, NONE, 1.1 kdebase-3.4.0-monospace.patch, NONE, 1.1 kdebase-3.4.0-xdg.patch, NONE, 1.1 kdebase-3.4.0rc1-konsole-keymap.patch, NONE, 1.1 kdebase-3.4.1-redhat.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 kdebase.spec, 1.83, 1.84 sources, 1.48, 1.49 kcmnspluginrc, 1.3, NONE kdebase-3.1-ssl-krb5.patch, 1.1, NONE kdebase-3.1.93-aboutkde.patch, 1.1, NONE kdebase-3.1.93-monospace.patch, 1.1, NONE kdebase-3.1.93-starthere.patch, 1.1, NONE kdebase-3.1.93-vroot.patch, 1.1, NONE kdebase-3.1.95-config.patch, 1.1, NONE kdebase-3.2.0-kickermenu.patch, 1.3, NONE kdebase-3.2.0-motif.patch, 1.1, NONE kdebase-3.2.2-pie.patch, 1.1, NONE kdebase-3.2.2-urandom.patch, 1.1, NONE kdebase-3.2.92-kpersonalizer.patch, 1.1, NONE kdebase-3.3.0-kioslav! e.patch, 1.1, NONE kdebase-3.3.0-klipper.patch, 1.1, NONE kdebase-3.3.1-cvs.patch, 1.1, NONE kdebase-3.3.1-kdeprintfax.patch, 1.1, NONE kdebase-3.3.1-kfind.patch, 1.1, NONE kdebase-3.3.1-redhat.patch, 1.1, NONE kdebase-3.3.1-servicebutton-saveas.patch, 1.1, NONE kdebase-3.3.1-sidebar.patch, 1.1, NONE post-3.3.1-kdebase-smb.diff, 1.1, NONE post-3.3.2-kdebase-htmlframes2.patch, 1.1, NONE start-here.png, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 3 21:43:10 UTC 2005


Author: than

Update of /cvs/dist/rpms/kdebase/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv1165

Modified Files:
	.cvsignore kdebase.spec sources 
Added Files:
	kdebase-3.3.92-fstab.patch kdebase-3.3.92-kpersonalizer.patch 
	kdebase-3.3.92-servicebutton-saveas.patch 
	kdebase-3.3.92-vroot.patch kdebase-3.4.0-config.patch 
	kdebase-3.4.0-fonts.patch kdebase-3.4.0-kdesktop-konsole.patch 
	kdebase-3.4.0-monospace.patch kdebase-3.4.0-xdg.patch 
	kdebase-3.4.0rc1-konsole-keymap.patch 
	kdebase-3.4.1-redhat.patch 
Removed Files:
	kcmnspluginrc kdebase-3.1-ssl-krb5.patch 
	kdebase-3.1.93-aboutkde.patch kdebase-3.1.93-monospace.patch 
	kdebase-3.1.93-starthere.patch kdebase-3.1.93-vroot.patch 
	kdebase-3.1.95-config.patch kdebase-3.2.0-kickermenu.patch 
	kdebase-3.2.0-motif.patch kdebase-3.2.2-pie.patch 
	kdebase-3.2.2-urandom.patch kdebase-3.2.92-kpersonalizer.patch 
	kdebase-3.3.0-kioslave.patch kdebase-3.3.0-klipper.patch 
	kdebase-3.3.1-cvs.patch kdebase-3.3.1-kdeprintfax.patch 
	kdebase-3.3.1-kfind.patch kdebase-3.3.1-redhat.patch 
	kdebase-3.3.1-servicebutton-saveas.patch 
	kdebase-3.3.1-sidebar.patch post-3.3.1-kdebase-smb.diff 
	post-3.3.2-kdebase-htmlframes2.patch start-here.png 
Log Message:
update to 3.4.2


kdebase-3.3.92-fstab.patch:
 fstabbackend.cpp |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.3.92-fstab.patch ---
--- kdebase-3.3.92/kioslave/media/kdedmodule/fstabbackend.cpp.orig	2005-02-15 15:21:42.649339006 +0100
+++ kdebase-3.3.92/kioslave/media/kdedmodule/fstabbackend.cpp	2005-02-15 15:25:01.400970375 +0100
@@ -93,6 +93,7 @@
 	  || mount->mountType() == "proc"
 	  || mount->mountType() == "unknown"
 	  || mount->mountType() == "none"
+	  || mount->mountType() == "sunrpc"
 	  || mount->mountedFrom() == "none"
 	  || mount->mountedFrom() == "tmpfs"
 	  || mount->mountedFrom().find("shm") != -1

kdebase-3.3.92-kpersonalizer.patch:
 kpersonalizer/kospage.cpp                      |   61 +++++++++++++++++++++++--
 kpersonalizer/kospage.h                        |    2 
 kpersonalizer/kospagedlg.ui                    |   21 ++++++++
 kpersonalizer/kstylepage.cpp                   |   30 ++++++++++--
 kpersonalizer/kstylepage.h                     |    7 +-
 kwin/kcmkwin/kwindecoration/kwindecoration.cpp |    2 
 6 files changed, 110 insertions(+), 13 deletions(-)

--- NEW FILE kdebase-3.3.92-kpersonalizer.patch ---
--- kdebase-3.3.92/kwin/kcmkwin/kwindecoration/kwindecoration.cpp.kper	2005-01-03 15:51:05.000000000 +0100
+++ kdebase-3.3.92/kwin/kcmkwin/kwindecoration/kwindecoration.cpp	2005-02-15 15:14:24.065146611 +0100
@@ -431,7 +431,7 @@
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf->readEntry("PluginLib",
-					((QPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
+					((QPixmap::defaultDepth() > 8) ? "kwin_bluecurve" : "kwin_quartz"));
 	QString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.
--- kdebase-3.3.92/kpersonalizer/kstylepage.h.kper	2004-09-25 13:31:51.000000000 +0200
+++ kdebase-3.3.92/kpersonalizer/kstylepage.h	2005-02-15 15:14:24.070145873 +0100
@@ -77,6 +77,7 @@
 	QColor link;
 	QColor visitedLink;
 
+	QListViewItem * bluecurve;
 	QListViewItem * kde;
 	QListViewItem * classic;
 	QListViewItem * keramik;
@@ -88,14 +89,14 @@
 
 	// widget-style existence
 	bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist,
-		cde_exist, win_exist, platinum_exist, kde_plastik_exist;
+		cde_exist, win_exist, platinum_exist, kde_plastik_exist, bluecurve_exist;
 
 	// kwin-style-existence
 	bool kwin_keramik_exist, kwin_default_exist, kwin_system_exist,
-		kwin_win_exist, kwin_cde_exist, kwin_quartz_exist, kwin_plastik_exist;
+		kwin_win_exist, kwin_cde_exist, kwin_quartz_exist, kwin_plastik_exist, kwin_bluecurve_exist;
 
 	// icon-theme-existence
-	bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist;
+	bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist, icon_bluecurve_exist;
 
 public slots: // Public slots
 	/** to be connected to the OS page. Catches either KDE, CDE, win or mac and pre-sets the style.  */
--- kdebase-3.3.92/kpersonalizer/kstylepage.cpp.kper	2004-09-25 13:31:51.000000000 +0200
+++ kdebase-3.3.92/kpersonalizer/kstylepage.cpp	2005-02-15 15:14:24.071145725 +0100
@@ -51,6 +51,10 @@
 	klv_styles->addColumn( i18n( "Description" ) );
 	klv_styles->setAllColumnsShowFocus(true);
 
+	bluecurve = new QListViewItem( klv_styles);
+	bluecurve->setText( 0, i18n( "Bluecurve" ));
+	bluecurve->setText( 1, i18n( "Red Hat Linux ® default style" ) );
+
 	kde = new QListViewItem( klv_styles);
 	kde->setText( 0, QPixmap::defaultDepth() > 8 ? i18n( "Plastik" ) : i18n( "Light" ) );
 	kde->setText( 1, i18n( "KDE default style" ) );
@@ -80,7 +84,7 @@
 
 	// Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp
 	//       and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well.
-	defaultKWinStyle = QPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz";
+	defaultKWinStyle = QPixmap::defaultDepth() > 8 ? "kwin_bluecurve" : "kwin_quartz";
 	appliedStyle = NULL;
 
 	getAvailability();
@@ -133,6 +137,8 @@
 			else if (kwin_quartz_exist)
 				kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop"));
 		}
+		else if (bluecurve->isSelected())
+			kdf = new KDesktopFile(kstd->findResource("data", "kwin/bluecurve.desktop"));
 
 		if (kdf) {
 			kdf->setGroup("Desktop Entry");
@@ -228,6 +234,8 @@
 		else if ( (classic->isSelected() || cde->isSelected() || win->isSelected())
 			&& (QColor::numBitPlanes() <= 8) && icon_Locolor_exist)
 				theme = "Locolor";
+		else if (bluecurve->isSelected() && icon_bluecurve_exist)
+				theme = "Bluecurve";
 	}
 	// save, what we got
 	KGlobal::config()->setGroup("Icons");
@@ -308,9 +316,10 @@
 		klv_styles->setSelected(cde,true);
 	else if(style=="win" && win_exist)
 		klv_styles->setSelected(win,true);
-	else if(style=="mac") {
+	else if(style=="mac")
 		klv_styles->setSelected(platinum,true);
-	}
+	else if(style=="Bluecurve" && bluecurve_exist)
+		klv_styles->setSelected(bluecurve,true);
 }
 
 /** set the defaults for this page */
@@ -361,6 +370,12 @@
 			set->usrCol2.setNamedColor("#6C8BB9");
 			set->colorFile=locate("colors","EveX.kcsrc");
 		}
+		else if(bluecurve->isSelected()){
+			set->bgMode="VerticalGradient";
+			set->usrCol1.setNamedColor("#8a94c6");
+			set->usrCol2.setNamedColor("#687096");
+			set->colorFile=locate("colors","Bluecurve.kcsrc");
+		}
 		set->contrast=7;
 		config = new KSimpleConfig(set->colorFile, true);
 		config->setGroup("Color Scheme");
@@ -413,7 +428,7 @@
 void KStylePage::getAvailability() {
 	// test, wich styles are available
 	kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist
-		= kde_plastik_exist = win_exist = platinum_exist = false;
+		= kde_plastik_exist = win_exist = platinum_exist = bluecurve_exist = false;
 	QStringList styles = QStyleFactory::keys();
 	for (QStringList::iterator it = styles.begin(); it != styles.end(); it++) {
 		if (*it == "Keramik") kde_keramik_exist = true;
@@ -424,6 +439,7 @@
 		else if (*it == "Windows") win_exist = true;
 		else if (*it == "Platinum") platinum_exist = true;
 		else if (*it == "Light, 3rd revision") kde_light_exist = true;
+		else if (*it == "Bluecurve") bluecurve_exist = true;
 	}
 	// and disable the ListItems, if they are not.
 	if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false);
@@ -432,6 +448,7 @@
 	if (!cde_exist) cde->setVisible(false);
 	if (!win_exist) win->setVisible(false);
 	if (!platinum_exist) platinum->setVisible(false);
+	if (!bluecurve_exist) bluecurve->setVisible(false);
 
 	// test, wich KWin-styles are available
 	kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist
@@ -450,10 +467,12 @@
 		kwin_cde_exist = true;
 	if (!kstd->findResource("data", "kwin/quartz.desktop").isNull())
 		kwin_quartz_exist = true;
+	if (!kstd->findResource("data", "kwin/bluecurve.desktop").isNull())
+		kwin_bluecurve_exist = true;
 	kwin_default_exist = true;	// we can't check for a .desktop-file for the old default because there is none
 
 	// check, wich Icon-themes are available
-	icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false;
+	icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = icon_bluecurve_exist = false;
 	QStringList icons(KIconTheme::list());
 	for (QStringList::iterator it=icons.begin(); it != icons.end(); it++) {
 		KIconTheme icontheme(*it);
@@ -461,6 +480,7 @@
 		if (*it == "crystalsvg") icon_crystalsvg_exist = true;
 		else if (*it == "kdeclassic") icon_kdeclassic_exist = true;
 		else if (*it == "Locolor") icon_Locolor_exist = true;
+		else if (*it == "Bluecurve") icon_bluecurve_exist = true;
 	}
 }
 
--- kdebase-3.3.92/kpersonalizer/kospage.h.kper	2005-02-04 00:19:05.000000000 +0100
+++ kdebase-3.3.92/kpersonalizer/kospage.h	2005-02-15 15:14:24.071145725 +0100
@@ -32,6 +32,7 @@
 	~KOSPage();
 	void save(bool currSettings=true);
 	void saveCheckState(bool currSettings);
+	void writeBluecurve();
 	void writeKDE();
 	void writeUNIX();
 	void writeWindows();
@@ -41,6 +42,7 @@
 	void writeUserDefaults();
 	/** retrieve the user's local values */
 	void getUserDefaults();
+	void slotBluecurveDescription();
 	void slotMacDescription();
 	void slotWindowsDescription();
 	void slotUnixDescription();
--- kdebase-3.3.92/kpersonalizer/kospagedlg.ui.kper	2005-02-04 00:19:05.000000000 +0100
+++ kdebase-3.3.92/kpersonalizer/kospagedlg.ui	2005-02-15 15:14:24.067146316 +0100
@@ -73,13 +73,25 @@
                 </property>
                 <widget class="QRadioButton" row="0" column="0">
                     <property name="name">
+                        <cstring>rb_bluecurve</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Bluecurve (R)</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+
+                <widget class="QRadioButton">
+                    <property name="name">
                         <cstring>rb_kde</cstring>
                     </property>
                     <property name="text">
                         <string>KDE (TM)</string>
                     </property>
                     <property name="checked">
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                 </widget>
                 <widget class="QRadioButton" row="1" column="0">
@@ -183,6 +195,12 @@
 </widget>
 <connections>
     <connection>
+        <sender>rb_bluecurve</sender>
+        <signal>clicked()</signal>
+        <receiver>KOSPageDlg</receiver>
+        <slot>slotBluecurveDescription()</slot>
+    </connection>
+    <connection>
         <sender>rb_kde</sender>
         <signal>clicked()</signal>
         <receiver>KOSPageDlg</receiver>
@@ -208,6 +226,7 @@
     </connection>
 </connections>
 <slots>
+    <slot>slotBluecurveDescription()</slot>
     <slot>slotWindowsDescription()</slot>
     <slot>slotKDEDescription()</slot>
     <slot>slotMacDescription()</slot>
--- kdebase-3.3.92/kpersonalizer/kospage.cpp.kper	2005-02-04 00:19:05.000000000 +0100
+++ kdebase-3.3.92/kpersonalizer/kospage.cpp	2005-02-15 15:17:57.105666576 +0100
@@ -37,7 +37,7 @@
 KOSPage::KOSPage(QWidget *parent, const char *name ) : KOSPageDlg(parent,name) {
 	px_osSidebar->setPixmap(UserIcon("step2.png"));
 	// initialize the textview with the default description - KDE of course
-	slotKDEDescription();
+	slotBluecurveDescription();
 	// Set the configfiles
 	cglobal = new KConfig("kdeglobals");
 	claunch = new KConfig("klaunchrc", false, false);
@@ -105,7 +105,10 @@
 		// Set the path for the keysscheme resource files
 		KGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys");
 		// write the settings to the configfiles, depending on wich radiobutton is checked
-		if(rb_kde->isChecked()){
+		if(rb_bluecurve->isChecked()) {
+			writeBluecurve();
+			emit selectedOS("Bluecurve");
+		} else if(rb_kde->isChecked()){
 			writeKDE();
 			emit selectedOS("KDE");	// send a signal to be caught by the KStylePage to set the according style by default depending on the OS selection
 		}
@@ -131,6 +134,46 @@
 	}
 }
 
+/* Write Bluecurve behaviour */
+void KOSPage::writeBluecurve() {
+	kdDebug() << "KOSPage::writeBluecurve()" << endl;
+
+	ckcmdisplay->setGroup("Bluecurve");
+	ckcmdisplay->writeEntry("macStyle", false, true, true);
+
+	cglobal->setGroup("Bluecurve");
+	cglobal->writeEntry("SingleClick", false, true, true);
+
+	claunch->setGroup("FeedbackStyle");
+	claunch->writeEntry("BusyCursor", false);
+
+	cwin->setGroup("Windows");
+	cwin->writeEntry("TitlebarDoubleClickCommand", "Shade");
+	cwin->writeEntry("FocusPolicy", "ClickToFocus");
+	cwin->writeEntry("AltTabStyle", "KDE");
+	cwin->setGroup( "MouseBindings");
+	cwin->writeEntry("CommandActiveTitlebar2", "Lower");
+	cwin->writeEntry("CommandActiveTitlebar3", "Operations menu");
+
+	cdesktop->setGroup( "Menubar" );
+	cdesktop->writeEntry("ShowMenubar", false);
+	cdesktop->setGroup( "Mouse Buttons" );
+	cdesktop->writeEntry("Middle", "WindowListMenu");
+	cdesktop->setGroup( "FMSettings" );
+	cdesktop->writeEntry("UnderlineLinks", true);
+
+	ckonqueror->setGroup( "FMSettings" );
+	ckonqueror->writeEntry("UnderlineLinks", true);
+
+	ckcminput->setGroup("KDE");
+	ckcminput->writeEntry("ChangeCursor", true, true, true );
+
+	cklipper->setGroup("General");
+	cklipper->writeEntry("SynchronizeClipboards", false);
+
+	writeKeyEntrys(locate("keys", "bluecurve.kksrc"));
+}
+
 
 	/** write the settings for KDE-Behavior (called by saveCheckStatus) */
 void KOSPage::writeKDE(){
@@ -343,6 +386,18 @@
 	delete defScheme;
 }
 
+void KOSPage::slotBluecurveDescription(){
+	kdDebug() << "slotBluecurveDescription()" << endl;
+	textview_ospage->setText("");
+	textview_ospage->setText(i18n(
+	"<b>Window activation:</b> <i>Focus on click</i><br>"
+	"<b>Titlebar double-click:</b> <i>Shade window</i><br>"
+	"<b>Mouse selection:</b> <i>Double click</i><br>"
+	"<b>Application startup notification:</b> <i>busy cursor</i><br>"
+	"<b>Keyboard scheme:</b> <i>Bluecurve</i><br>"
+	));
+}
+
 void KOSPage::slotKDEDescription(){
 	kdDebug() << "slotKDEDescription()" << endl;
 	textview_ospage->setText("");
@@ -498,7 +553,7 @@
 
 	/** resets the radio button selected to kde */
 void KOSPage::setDefaults(){
-    rb_kde->setChecked(true);
+    rb_bluecurve->setChecked(true);
     cb_gestures->setChecked(false);
 }
 

kdebase-3.3.92-servicebutton-saveas.patch:
 servicebutton.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.3.92-servicebutton-saveas.patch ---
--- kdebase-3.3.92/kicker/buttons/servicebutton.cpp.saveas	2005-02-04 00:18:59.000000000 +0100
+++ kdebase-3.3.92/kicker/buttons/servicebutton.cpp	2005-02-15 15:31:33.564022212 +0100
@@ -233,7 +233,7 @@
     QString oldPath = oldUrl.path();
     if (locateLocal("appdata", oldUrl.fileName()) != oldPath)
     {
-       QString path = KickerLib::newDesktopFile(oldUrl);
+       QString path = KickerLib::copyDesktopFile(oldUrl);
        newUrl.setPath(path);
        _id = path;
     }

kdebase-3.3.92-vroot.patch:
 desktopbehavior_impl.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.3.92-vroot.patch ---
--- kdebase-3.3.92/kcontrol/konq/desktopbehavior_impl.cpp.orig	2005-02-15 18:57:09.717565337 +0100
+++ kdebase-3.3.92/kcontrol/konq/desktopbehavior_impl.cpp	2005-02-15 18:57:30.992421648 +0100
@@ -298,7 +298,7 @@
     else
         desktopMenuGroup->setButton( 0 );
     g_pConfig->setGroup( "General" );
-    vrootBox->setChecked( g_pConfig->readBoolEntry( "SetVRoot", false ) );
+    vrootBox->setChecked( g_pConfig->readBoolEntry( "SetVRoot", true ) );
     iconsEnabledBox->setChecked( g_pConfig->readBoolEntry( "Enabled", true ) );
     autoLineupIconsBox->setChecked( g_pConfig->readBoolEntry( "AutoLineUpIcons", false ) );
 

kdebase-3.4.0-config.patch:
 kickerSettings.kcfg |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.4.0-config.patch ---
--- kdebase-3.4.0/kicker/share/kickerSettings.kcfg.orig	2005-02-25 23:55:30.745524677 +0100
+++ kdebase-3.4.0/kicker/share/kickerSettings.kcfg	2005-02-25 23:57:22.070049798 +0100
@@ -83,7 +83,7 @@
 
 <entry name="DetailedMenuEntries" type="Bool" >
       <label>Show detailed menu entries</label>
-      <default>true</default>
+      <default>false</default>
    </entry>
 
 <entry name="DetailedEntriesNamesFirst" type="Bool" >
@@ -206,7 +206,7 @@
 
 <entry name="UseSidePixmap" type="Bool" >
       <label>Use side image in Kmenu</label>
-      <default>true</default>
+      <default>false</default>
    </entry>
 
 <entry name="SidePixmapName" key="SideName" type="String" >

kdebase-3.4.0-fonts.patch:
 kcontrol/fonts/fonts.cpp                         |   18 +++++++++---------
 kdm/config.def                                   |   14 +++++++-------
 kpersonalizer/keyecandypage.cpp                  |   12 ++++++------
 ksplashml/themeengine/standard/themestandard.cpp |    4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE kdebase-3.4.0-fonts.patch ---
--- kdebase-3.4.0/kdm/config.def.tn	2005-03-10 12:59:38.118425857 +0100
+++ kdebase-3.4.0/kdm/config.def	2005-03-10 13:01:11.724573115 +0100
@@ -2058,27 +2058,27 @@
 
 Key: StdFont
 Type: string
-Default: "helvetica,12,5,0,50,0"
-CDefault: "helvetica,12"
+Default: "Sans,12,5,0,50,0"
+CDefault: "Sans,12"
 User: greeter(normalFont):font
-Instance: #*/"helvetica,10,5,0,50,0"
+Instance: #*/"Sans,10,5,0,50,0"
 Comment: &
 Description:
  The normal font used in the greeter.
 
 Key: FailFont
 Type: string
-Default: "helvetica,12,5,0,75,0"
-CDefault: "helvetica,12,bold"
+Default: "Sans,12,5,0,75,0"
+CDefault: "Sans,12,bold"
 User: greeter:font
-Instance: #*/"helvetica,10,5,0,75,0"
+Instance: #*/"Sans,10,5,0,75,0"
 Comment: &
 Description:
  The font used for the <quote>Login Failed</quote> message.
 
 Key: AntiAliasing
 Type: bool
-Default: false
+Default: true
 User: greeter-c
 Instance: #*/!
 Comment: &
--- kdebase-3.4.0/kpersonalizer/keyecandypage.cpp.tn	2005-03-10 12:57:51.520201294 +0100
+++ kdebase-3.4.0/kpersonalizer/keyecandypage.cpp	2005-03-10 12:59:14.078983447 +0100
@@ -717,13 +717,13 @@
 	b_useXft=QSettings().readBoolEntry("/qt/useXft");
 	b_enableXft=QSettings().readBoolEntry("/qt/enableXft");
 	KGlobal::config()->setGroup("General");
-	userFonts.append(KGlobal::config()->readEntry("fixed", "courier,10,-1,5,50,0,0,0,0,0"));
-	userFonts.append(KGlobal::config()->readEntry("font", "helvetica,12,-1,5,50,0,0,0,0,0"));
-	userFonts.append(KGlobal::config()->readEntry("menuFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
-	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "helvetica,11,-1,5,50,0,0,0,0,0"));
-	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "helvetica,12,-1,5,50,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("fixed", "Monospace,10,-1,5,50,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("font", "Sans,10,-1,5,50,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("menuFont", "Sans,10,-1,5,50,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("taskbarFont", "Sans,10,-1,5,50,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("toolBarFont", "Sans,10,-1,5,50,0,0,0,0,0"));
 	KGlobal::config()->setGroup("WM");
-	userFonts.append(KGlobal::config()->readEntry("activeFont", "helvetica,12,-1,5,75,0,0,0,0,0"));
+	userFonts.append(KGlobal::config()->readEntry("activeFont", "Sans,10,-1,5,75,0,0,0,0,0"));
 
 	KGlobal::config()->setGroup("PanelIcons");
 	st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
--- kdebase-3.4.0/ksplashml/themeengine/standard/themestandard.cpp.tn	2005-03-10 12:56:59.713868096 +0100
+++ kdebase-3.4.0/ksplashml/themeengine/standard/themestandard.cpp	2005-03-10 12:57:37.276309243 +0100
@@ -32,7 +32,7 @@
 
 ThemeStandard::ThemeStandard( QWidget *parent, const char *name, const QStringList &args )
   :ThemeEngine( parent, name, args ), mIcon(0L), mPrevIcon(0L), mIconCount(0), mStdIconWidth(-1),
-  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("helvetica"),
+  mIconPos(WndIcon::HBottomLeft), mSbAtTop(false), mSbVisible(true), mSbPbVisible(true), mSbFontName("Sans"),
   mSbFontSz(16), mSbFontBold(true), mSbFontItalic(false), mSbFont(QFont()), mSbFg(QColor()), mSbBg(QColor()),
   mSbIcon("run"), mIconsVisible(true), mIconsJumping(true), mSplashScreen("(Default)")
 {
@@ -148,7 +148,7 @@
   mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
   mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);
 
-  mSbFontName = cfg->readEntry( "Statusbar Font", "helvetica" );
+  mSbFontName = cfg->readEntry( "Statusbar Font", "Sans" );
   mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 );
   mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true );
   mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false );
--- kdebase-3.4.0/kcontrol/fonts/fonts.cpp.tn	2005-03-10 12:37:21.457237907 +0100
+++ kdebase-3.4.0/kcontrol/fonts/fonts.cpp	2005-03-10 12:52:55.722976228 +0100
@@ -524,17 +524,17 @@
 
   // Keep in sync with kdelibs/kdecore/kglobalsettings.cpp
 
-  QFont f0("helvetica", 12);
-  QFont f1("courier", 12);
-  QFont f2("helvetica", 10);
-  QFont f3("helvetica", 12, QFont::Bold);
-  QFont f4("helvetica", 11);
+  QFont f0("Sans", 10);
+  QFont f1("Monospace", 10);
+  QFont f2("Sans", 10);
+  QFont f3("Sans", 10, QFont::Bold);
+  QFont f4("Sans", 10);
 
-  f0.setPointSize(12);
-  f1.setPointSize(12);
+  f0.setPointSize(10);
+  f1.setPointSize(10);
   f2.setPointSize(10);
-  f3.setPointSize(12);
-  f4.setPointSize(11);
+  f3.setPointSize(10);
+  f4.setPointSize(10);
 
   defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
 

kdebase-3.4.0-kdesktop-konsole.patch:
 krootwm.cc |   19 +++++++++++++++++++
 krootwm.h  |    1 +
 2 files changed, 20 insertions(+)

--- NEW FILE kdebase-3.4.0-kdesktop-konsole.patch ---
--- kdebase-3.4.0/kdesktop/krootwm.cc.kdesktop-konsole	2005-03-17 16:27:07.000000000 +0100
+++ kdebase-3.4.0/kdesktop/krootwm.cc	2005-03-21 15:06:50.000000000 +0100
@@ -50,6 +50,7 @@
 #include <kuser.h>
 #include <qfile.h>
 
+#include <kprocess.h>
 #include "krootwm.h"
 #include "kdiconview.h"
 #include "desktop.h"
@@ -131,6 +132,10 @@
   {
      new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
   }
+
+  new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ),
+               m_actionCollection, "open_terminal" );
+
   if (!KGlobal::config()->isImmutable())
   {
      new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ),
@@ -385,6 +390,13 @@
        needSeparator = true;
     }
 
+    action = m_actionCollection->action("open_terminal");
+    if (action)
+    {
+       action->plug( desktopMenu );
+       needSeparator = true;
+    }
+
     if (needSeparator)
     {
         desktopMenu->insertSeparator();
@@ -695,6 +707,13 @@
   return args;
 }
 
+void KRootWm::slotOpenTerminal()
+{
+  KProcess proc;
+  proc << locate("exe", "konsole");
+  proc.start(KProcess::DontCare);
+}
+
 void KRootWm::slotConfigureDesktop() {
   QStringList args = configModules();
   args.prepend(i18n("Desktop"));
--- kdebase-3.4.0/kdesktop/krootwm.h.kdesktop-konsole	2005-03-17 16:27:07.000000000 +0100
+++ kdebase-3.4.0/kdesktop/krootwm.h	2005-03-21 13:49:51.000000000 +0100
@@ -117,6 +117,7 @@
   void slotSessionActivated( int );
   void slotNewSession();
   void slotLockNNewSession();
+  void slotOpenTerminal();
 
 private:
   KDesktop* m_pDesktop;

kdebase-3.4.0-monospace.patch:
 konsole.cpp      |    5 -----
 konsole_part.cpp |    5 -----
 2 files changed, 10 deletions(-)

--- NEW FILE kdebase-3.4.0-monospace.patch ---
--- kdebase-3.3.92/konsole/konsole/konsole.cpp.fontkonsole	2005-02-04 00:19:05.000000000 +0100
+++ kdebase-3.3.92/konsole/konsole/konsole.cpp	2005-02-15 14:37:26.071889458 +0100
@@ -179,8 +179,6 @@
  "13",  // medium
  "15",  // large
  "20", // huge
- "-misc-console-medium-r-normal--16-160-72-72-c-80-iso10646-1", // "Linux"
- "-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1",    // "Unicode"
  };
 #define TOPFONT (sizeof(fonts)/sizeof(char*))
 #define DEFAULTFONT TOPFONT
@@ -625,9 +623,6 @@
          << i18n("&Large")
          << i18n("&Huge")
          << ""
-         << i18n("L&inux")
-         << i18n("&Unicode")
-         << ""
          << i18n("&Custom...");
       selectFont->setItems(it);
       selectFont->plug(m_options);
--- kdebase-3.3.92/konsole/konsole/konsole_part.cpp.fontkonsole	2005-02-04 00:19:05.000000000 +0100
+++ kdebase-3.3.92/konsole/konsole/konsole_part.cpp	2005-02-15 14:42:03.506894140 +0100
@@ -145,8 +145,6 @@
  "13",  // medium
  "15",  // large
  "20", // huge
- "-misc-console-medium-r-normal--16-160-72-72-c-80-iso10646-1", // "Linux"
- "-misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1",    // "Unicode"
  };
 
 #define TOPFONT (sizeof(fonts)/sizeof(char*))
@@ -398,9 +396,6 @@
      << i18n("&Large")
      << i18n("&Huge")
      << ""
-     << i18n("&Linux")
-     << i18n("&Unicode")
-     << ""
      << i18n("&Custom...");
      selectFont->setItems(it);
      selectFont->plug(m_options);

kdebase-3.4.0-xdg.patch:
 kde-essential.menu |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdebase-3.4.0-xdg.patch ---
--- kdebase-3.4.0/applnk/kde-essential.menu.tn	2005-04-25 16:18:40.000000000 +0200
+++ kdebase-3.4.0/applnk/kde-essential.menu	2005-04-25 16:18:58.000000000 +0200
@@ -2,6 +2,7 @@
   "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
 
 <Menu>
+	<Name>Applications</Name>
         <!-- The following menus are hidden by default -->
 	<Menu>
 		<Name>Settings</Name>

kdebase-3.4.0rc1-konsole-keymap.patch:
 konsole/TEPty.cpp           |   16 +++++
 konsole/TEPty.h             |    1 
 konsole/TEmuVt102.cpp       |   14 +++++
 konsole/TEmuVt102.h         |    2 
 konsole/TEmulation.cpp      |    5 +
 konsole/TEmulation.h        |    2 
 konsole/default.keytab.h    |  102 ++++++++++++++++++-------------------
 konsole/keytrans.cpp        |   27 +++++++++
 konsole/keytrans.h          |    2 
 konsole/session.cpp         |    1 
 other/README.default.Keytab |  121 +++++++++++++++++++++-----------------------
 11 files changed, 177 insertions(+), 116 deletions(-)

--- NEW FILE kdebase-3.4.0rc1-konsole-keymap.patch ---
--- kdebase-3.4.0/konsole/other/README.default.Keytab.konsole	2004-11-26 11:59:38.000000000 +0100
+++ kdebase-3.4.0/konsole/other/README.default.Keytab	2005-04-18 09:28:15.000000000 +0200
@@ -46,6 +46,8 @@
 key Backspace      : "\x7f"
 
 # Arrow keys in VT52 mode
+# shift up/down are reserved for scrolling.
+# shift left/right are reserved for switching between tabs (this is hardcoded).
 
 key Up   -Shift-Ansi : "\EA"
 key Down -Shift-Ansi : "\EB"
@@ -54,74 +56,69 @@
 
 # Arrow keys in ANSI mode with Application - and Normal Cursor Mode)
 
-key Up   -Shift+Ansi+AppCuKeys : "\EOA"
-key Down -Shift+Ansi+AppCuKeys : "\EOB"
-key Right-Shift+Ansi+AppCuKeys : "\EOC"
-key Left -Shift+Ansi+AppCuKeys : "\EOD"
-
-key Up   -Shift+Ansi-AppCuKeys : "\E[A"
-key Down -Shift+Ansi-AppCuKeys : "\E[B"
-key Right-Shift+Ansi-AppCuKeys : "\E[C"
-key Left -Shift+Ansi-AppCuKeys : "\E[D"
-
-key Up   +Shift+AppScreen : "\E[a"
-key Down +Shift+AppScreen : "\E[b"
-key Right+Shift+AppScreen : "\E[c"
-key Left +Shift+AppScreen : "\E[d"
+key Up    -Shift-AnyMod+Ansi+AppCuKeys           : "\EOA"
+key Down  -Shift-AnyMod+Ansi+AppCuKeys           : "\EOB"
+key Right -Shift-AnyMod+Ansi+AppCuKeys           : "\EOC"
+key Left  -Shift-AnyMod+Ansi+AppCuKeys           : "\EOD"
+
+key Up    -Shift-AnyMod+Ansi-AppCuKeys           : "\E[A"
+key Down  -Shift-AnyMod+Ansi-AppCuKeys           : "\E[B"
+key Right -Shift-AnyMod+Ansi-AppCuKeys           : "\E[C"
+key Left  -Shift-AnyMod+Ansi-AppCuKeys           : "\E[D"
+
+key Up    -Shift+AnyMod+Ansi                     : "\E[1;*A"
+key Down  -Shift+AnyMod+Ansi                     : "\E[1;*B"
+key Right -Shift+AnyMod+Ansi                     : "\E[1;*C"
+key Left  -Shift+AnyMod+Ansi                     : "\E[1;*D"
 
 # other grey PC keys
 
 key Enter+NewLine : "\r\n"
 key Enter-NewLine : "\r"
 
-key Home  -Shift-AppCuKeys : "\E[H"  
-key End   -Shift-AppCuKeys : "\E[F"  
-key Home  +Shift-AppCuKeys : "\E[2H"  
-key End   +Shift-AppCuKeys : "\E[2F"  
-
-key Home  -Shift+AppCuKeys : "\EOH"  
-key End   -Shift+AppCuKeys : "\EOF"  
-key Home  +Shift+AppCuKeys : "\EO2H"  
-key End   +Shift+AppCuKeys : "\EO2F"  
-
-key Insert-Shift : "\E[2~"  
-key Delete-Shift : "\E[3~"  
-key Prior -Shift : "\E[5~"  
-key Next  -Shift : "\E[6~"  
-
-key Insert+Shift : "\E[2;2~"  
-key Delete+Shift : "\E[3;2~"  
-key Prior +Shift+AppScreen : "\E[5;2"
-key Next  +Shift+AppScreen  : "\E[6;2"
-
-
-# Function keys w/o Shift modifier
-
-key F1    -Shift   : "\EOP"
-key F2    -Shift   : "\EOQ"
-key F3    -Shift   : "\EOR"
-key F4    -Shift   : "\EOS"
-key F5    -Shift   : "\E[15~"
-key F6    -Shift   : "\E[17~"
-key F7    -Shift   : "\E[18~"
-key F8    -Shift   : "\E[19~"
-key F9    -Shift   : "\E[20~"
-key F10   -Shift   : "\E[21~"
-key F11   -Shift   : "\E[23~"
-key F12   -Shift   : "\E[24~"
-
-key F1 +Shift    : "\EO2P"
-key F2 +Shift    : "\EO2Q"
-key F3 +Shift    : "\EO2R"
-key F4 +Shift    : "\EO2S"
-key F5 +Shift    : "\E[15;2~"
-key F6 +Shift    : "\E[17;2~"
-key F7 +Shift    : "\E[18;2~"
-key F8 +Shift    : "\E[19;2~"
-key F9 +Shift    : "\E[20;2~"
-key F10+Shift    : "\E[21;2~"
-key F11+Shift    : "\E[23;2~"
-key F12+Shift    : "\E[24;2~"
+key Home        -AnyMod     -AppCuKeys           : "\E[H"  
+key End         -AnyMod     -AppCuKeys           : "\E[F"  
+key Home        -AnyMod     +AppCuKeys           : "\EOH"  
+key End         -AnyMod     +AppCuKeys           : "\EOF"  
+key Home        +AnyMod                          : "\E[1;*H"
+key End         +AnyMod                          : "\E[1;*F"
+
+key Insert      -AnyMod                          : "\E[2~"
+key Delete      -AnyMod                          : "\E[3~"
+key Insert      +AnyMod                          : "\E[2;*~"
+key Delete      +AnyMod                          : "\E[3;*~"
+
+key Prior -Shift-AnyMod                          : "\E[5~"
+key Next  -Shift-AnyMod                          : "\E[6~"
+key Prior -Shift+AnyMod                          : "\E[5;*~"
+key Next  -Shift+AnyMod                          : "\E[6;*~"
+
+# Function keys
+key F1          -AnyMod                          : "\EOP"
+key F2          -AnyMod                          : "\EOQ"
+key F3          -AnyMod                          : "\EOR"
+key F4          -AnyMod                          : "\EOS"
+key F5          -AnyMod                          : "\E[15~"
+key F6          -AnyMod                          : "\E[17~"
+key F7          -AnyMod                          : "\E[18~"
+key F8          -AnyMod                          : "\E[19~"
+key F9          -AnyMod                          : "\E[20~"
+key F10         -AnyMod                          : "\E[21~"
+key F11         -AnyMod                          : "\E[23~"
+key F12         -AnyMod                          : "\E[24~"
+
+key F1          +AnyMod                          : "\EO*P"
+key F2          +AnyMod                          : "\EO*Q"
+key F3          +AnyMod                          : "\EO*R"
+key F4          +AnyMod                          : "\EO*S"
+key F5          +AnyMod                          : "\E[15;*~"
+key F6          +AnyMod                          : "\E[17;*~"
+key F7          +AnyMod                          : "\E[18;*~"
+key F8          +AnyMod                          : "\E[19;*~"
+key F9          +AnyMod                          : "\E[20;*~"
+key F10         +AnyMod                          : "\E[21;*~"
+key F11         +AnyMod                          : "\E[23;*~"
+key F12         +AnyMod                          : "\E[24;*~"
 
 # Work around dead keys
 
--- kdebase-3.4.0/konsole/konsole/TEmuVt102.cpp.konsole	2005-04-18 09:28:15.000000000 +0200
+++ kdebase-3.4.0/konsole/konsole/TEmuVt102.cpp	2005-04-18 09:28:15.000000000 +0200
@@ -1194,6 +1194,20 @@
   }
 }
 
+char TEmuVt102::getErase()
+{
+  int cmd = CMD_none; 
+  const char* txt; 
+  int len;
+  bool metaspecified;
+  
+  if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len,
+      &metaspecified) && (cmd==CMD_send) && (len == 1))
+    return txt[0];
+    
+  return '\b';
+}
+
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                               Diagnostic                                  */
--- kdebase-3.4.0/konsole/konsole/TEmulation.cpp.konsole	2005-01-23 18:30:46.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/TEmulation.cpp	2005-04-18 09:28:15.000000000 +0200
@@ -480,6 +480,11 @@
   }
 }
 
+char TEmulation::getErase()
+{
+  return '\b';
+}
+
 void TEmulation::setListenToKeyPress(bool l)
 {
   listenToKeyPress=l;
--- kdebase-3.4.0/konsole/konsole/default.keytab.h.konsole	2004-11-26 11:59:38.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/default.keytab.h	2005-04-18 09:31:38.000000000 +0200
@@ -15,60 +15,58 @@
   "key Down -Shift-Ansi : \"\\EB\"\n"
   "key Right-Shift-Ansi : \"\\EC\"\n"
   "key Left -Shift-Ansi : \"\\ED\"\n"
-  "key Up   -Shift+Ansi+AppCuKeys : \"\\EOA\"\n"
-  "key Down -Shift+Ansi+AppCuKeys : \"\\EOB\"\n"
-  "key Right-Shift+Ansi+AppCuKeys : \"\\EOC\"\n"
-  "key Left -Shift+Ansi+AppCuKeys : \"\\EOD\"\n"
-  "key Up   -Shift+Ansi-AppCuKeys : \"\\E[A\"\n"
-  "key Down -Shift+Ansi-AppCuKeys : \"\\E[B\"\n"
-  "key Right-Shift+Ansi-AppCuKeys : \"\\E[C\"\n"
-  "key Left -Shift+Ansi-AppCuKeys : \"\\E[D\"\n"
-  "key Up   +Shift+AppScreen : \"\\E[a\"\n"
-  "key Down +Shift+AppScreen : \"\\E[b\"\n"
-  "key Right+Shift+AppScreen : \"\\E[c\"\n"
-  "key Left +Shift+AppScreen : \"\\E[d\"\n"
+  "key Up    -Shift-AnyMod+Ansi+AppCuKeys           : \"\\EOA\"\n"
+  "key Down  -Shift-AnyMod+Ansi+AppCuKeys           : \"\\EOB\"\n"
+  "key Right -Shift-AnyMod+Ansi+AppCuKeys           : \"\\EOC\"\n"
+  "key Left  -Shift-AnyMod+Ansi+AppCuKeys           : \"\\EOD\"\n"
+  "key Up    -Shift-AnyMod+Ansi-AppCuKeys           : \"\\E[A\"\n"
+  "key Down  -Shift-AnyMod+Ansi-AppCuKeys           : \"\\E[B\"\n"
+  "key Right -Shift-AnyMod+Ansi-AppCuKeys           : \"\\E[C\"\n"
+  "key Left  -Shift-AnyMod+Ansi-AppCuKeys           : \"\\E[D\"\n"
+  "key Up    -Shift+AnyMod+Ansi                     : \"\\E[1;*A\"\n"
+  "key Down  -Shift+AnyMod+Ansi                     : \"\\E[1;*B\"\n"
+  "key Right -Shift+AnyMod+Ansi                     : \"\\E[1;*C\"\n"
+  "key Left  -Shift+AnyMod+Ansi                     : \"\\E[1;*D\"\n"
   "key Enter+NewLine : \"\\r\\n\"\n"
   "key Enter-NewLine : \"\\r\"\n"
-  "key Home  -Shift-AppCuKeys : \"\\E[H\"  \n"
-  "key End   -Shift-AppCuKeys : \"\\E[F\"  \n"
-  "key Home  +Shift-AppCuKeys : \"\\E[2H\"  \n"
-  "key End   +Shift-AppCuKeys : \"\\E[2F\"  \n"
-  "key Home  -Shift+AppCuKeys : \"\\EOH\"  \n"
-  "key End   -Shift+AppCuKeys : \"\\EOF\"  \n"
-  "key Home  +Shift+AppCuKeys : \"\\EO2H\"  \n"
-  "key End   +Shift+AppCuKeys : \"\\EO2F\"  \n"
-  "key Insert-Shift : \"\\E[2~\"  \n"
-  "key Delete-Shift : \"\\E[3~\"  \n"
-  "key Prior -Shift : \"\\E[5~\"  \n"
-  "key Next  -Shift : \"\\E[6~\"  \n"
-  "key Insert+Shift : \"\\E[2;2~\"  \n"
-  "key Delete+Shift : \"\\E[3;2~\"  \n"
-  "key Prior +Shift+AppScreen : \"\\E[5;2\"\n"
-  "key Next  +Shift+AppScreen  : \"\\E[6;2\"\n"
-  "key F1    -Shift   : \"\\EOP\"\n"
-  "key F2    -Shift   : \"\\EOQ\"\n"
-  "key F3    -Shift   : \"\\EOR\"\n"
-  "key F4    -Shift   : \"\\EOS\"\n"
-  "key F5    -Shift   : \"\\E[15~\"\n"
-  "key F6    -Shift   : \"\\E[17~\"\n"
-  "key F7    -Shift   : \"\\E[18~\"\n"
-  "key F8    -Shift   : \"\\E[19~\"\n"
-  "key F9    -Shift   : \"\\E[20~\"\n"
-  "key F10   -Shift   : \"\\E[21~\"\n"
-  "key F11   -Shift   : \"\\E[23~\"\n"
-  "key F12   -Shift   : \"\\E[24~\"\n"
-  "key F1 +Shift    : \"\\EO2P\"\n"
-  "key F2 +Shift    : \"\\EO2Q\"\n"
-  "key F3 +Shift    : \"\\EO2R\"\n"
-  "key F4 +Shift    : \"\\EO2S\"\n"
-  "key F5 +Shift    : \"\\E[15;2~\"\n"
-  "key F6 +Shift    : \"\\E[17;2~\"\n"
-  "key F7 +Shift    : \"\\E[18;2~\"\n"
-  "key F8 +Shift    : \"\\E[19;2~\"\n"
-  "key F9 +Shift    : \"\\E[20;2~\"\n"
-  "key F10+Shift    : \"\\E[21;2~\"\n"
-  "key F11+Shift    : \"\\E[23;2~\"\n"
-  "key F12+Shift    : \"\\E[24;2~\"\n"
+  "key Home        -AnyMod     -AppCuKeys           : \"\\E[H\"  \n"
+  "key End         -AnyMod     -AppCuKeys           : \"\\E[F\"  \n"
+  "key Home        -AnyMod     +AppCuKeys           : \"\\EOH\"  \n"
+  "key End         -AnyMod     +AppCuKeys           : \"\\EOF\"  \n"
+  "key Home        +AnyMod                          : \"\\E[1;*H\"\n"
+  "key End         +AnyMod                          : \"\\E[1;*F\"\n"
+  "key Insert      -AnyMod                          : \"\\E[2~\"\n"
+  "key Delete      -AnyMod                          : \"\\E[3~\"\n"
+  "key Insert      +AnyMod                          : \"\\E[2;*~\"\n"
+  "key Delete      +AnyMod                          : \"\\E[3;*~\"\n"
+  "key Prior -Shift-AnyMod                          : \"\\E[5~\"\n"
+  "key Next  -Shift-AnyMod                          : \"\\E[6~\"\n"
+  "key Prior -Shift+AnyMod                          : \"\\E[5;*~\"\n"
+  "key Next  -Shift+AnyMod                          : \"\\E[6;*~\"\n"
+  "key F1          -AnyMod                          : \"\\EOP\"\n"
+  "key F2          -AnyMod                          : \"\\EOQ\"\n"
+  "key F3          -AnyMod                          : \"\\EOR\"\n"
+  "key F4          -AnyMod                          : \"\\EOS\"\n"
+  "key F5          -AnyMod                          : \"\\E[15~\"\n"
+  "key F6          -AnyMod                          : \"\\E[17~\"\n"
+  "key F7          -AnyMod                          : \"\\E[18~\"\n"
+  "key F8          -AnyMod                          : \"\\E[19~\"\n"
+  "key F9          -AnyMod                          : \"\\E[20~\"\n"
+  "key F10         -AnyMod                          : \"\\E[21~\"\n"
+  "key F11         -AnyMod                          : \"\\E[23~\"\n"
+  "key F12         -AnyMod                          : \"\\E[24~\"\n"
+  "key F1          +AnyMod                          : \"\\EO*P\"\n"
+  "key F2          +AnyMod                          : \"\\EO*Q\"\n"
+  "key F3          +AnyMod                          : \"\\EO*R\"\n"
+  "key F4          +AnyMod                          : \"\\EO*S\"\n"
+  "key F5          +AnyMod                          : \"\\E[15;*~\"\n"
+  "key F6          +AnyMod                          : \"\\E[17;*~\"\n"
+  "key F7          +AnyMod                          : \"\\E[18;*~\"\n"
+  "key F8          +AnyMod                          : \"\\E[19;*~\"\n"
+  "key F9          +AnyMod                          : \"\\E[20;*~\"\n"
+  "key F10         +AnyMod                          : \"\\E[21;*~\"\n"
+  "key F11         +AnyMod                          : \"\\E[23;*~\"\n"
+  "key F12         +AnyMod                          : \"\\E[24;*~\"\n"
   "key Space +Control : \"\\x00\"\n"
   "key Up    +Shift-AppScreen  : scrollLineUp\n"
   "key Prior +Shift-AppScreen  : scrollPageUp\n"
--- kdebase-3.4.0/konsole/konsole/session.cpp.konsole	2005-01-23 18:30:46.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/session.cpp	2005-04-18 09:28:15.000000000 +0200
@@ -133,6 +133,7 @@
   sh->run(QFile::encodeName(pgm), args, term.latin1(), winId, add_to_utmp,
           ("DCOPRef("+appId+",konsole)").latin1(),
           ("DCOPRef("+appId+","+sessionId+")").latin1());
+  sh->setErase(em->getErase());
   if (!initial_cwd.isEmpty())
      QDir::setCurrent(cwd_save);
   else
--- kdebase-3.4.0/konsole/konsole/keytrans.h.konsole	2004-09-22 22:02:16.000000000 +0200
+++ kdebase-3.4.0/konsole/konsole/keytrans.h	2005-04-18 09:28:15.000000000 +0200
@@ -26,6 +26,7 @@
 #define BITS_Alt        6
 #define BITS_AppScreen  7
 #define BITS_COUNT      8
+#define BITS_AnyMod	9
 
 #define CMD_none          -1
 #define CMD_send           0
@@ -63,6 +64,7 @@
             ~KeyEntry();
             bool matches(int key, int bits, int mask);
             bool metaspecified(void);
+            bool anymodspecified(void);
             QString text();
             int ref;
          private:
--- kdebase-3.4.0/konsole/konsole/TEmuVt102.h.konsole	2003-01-01 12:47:39.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/TEmuVt102.h	2005-04-18 09:28:15.000000000 +0200
@@ -81,6 +81,8 @@
   void resetModes();
 
   void setConnect(bool r);
+  
+  char getErase();
 
 private:
 
--- kdebase-3.4.0/konsole/konsole/TEmulation.h.konsole	2005-04-13 14:11:10.000000000 +0200
+++ kdebase-3.4.0/konsole/konsole/TEmulation.h	2005-04-18 09:28:15.000000000 +0200
@@ -87,6 +87,8 @@
   
   bool utf8() { return m_codec->mibEnum() == 106; }
 
+  virtual char getErase();
+
   virtual void setListenToKeyPress(bool l);
   void setColumns(int columns);
 
--- kdebase-3.4.0/konsole/konsole/keytrans.cpp.konsole	2005-04-01 16:37:01.000000000 +0200
+++ kdebase-3.4.0/konsole/konsole/keytrans.cpp	2005-04-18 09:28:15.000000000 +0200
@@ -53,7 +53,13 @@
 
 bool KeyTrans::KeyEntry::metaspecified(void)
 {
-  return (mask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt));
+  return ((mask & (1 << BITS_Alt))    && (bits & (1 << BITS_Alt))) ||
+         ((mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)));
+}
+
+bool KeyTrans::KeyEntry::anymodspecified(void)
+{
+  return (mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod));
 }
 
 QString KeyTrans::KeyEntry::text()
@@ -118,12 +124,27 @@
                bool* metaspecified)
 {
   if (!m_fileRead) readConfig();
+  
+  if (bits & ((1<<BITS_Shift)|(1<<BITS_Alt)|(1<<BITS_Control)))
+    bits |= (1<<BITS_AnyMod);
+  
   for (QPtrListIterator<KeyEntry> it(tableX); it.current(); ++it)
     if (it.current()->matches(key,bits,0xffff))
     {
       *cmd = it.current()->cmd;
-      *txt = it.current()->txt.ascii();
       *len = it.current()->txt.length();
+      if ((*cmd==CMD_send) && it.current()->anymodspecified() && (*len < 16))
+      {
+        static char buf[16];
+        char *c, mask = '1' + BITS(0, bits&(1<<BITS_Shift)) +
+          BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control));
+        strcpy(buf, it.current()->txt.ascii());
+        c = strchr(buf, '*');
+        if (c) *c = mask;
+        *txt = buf;
+      }
+      else
+        *txt = it.current()->txt.ascii();
       *metaspecified = it.current()->metaspecified();
       return true;
     }
@@ -484,6 +505,8 @@
   defModSym("NewLine",    BITS_NewLine      );
   defModSym("AppCuKeys",  BITS_AppCuKeys    );
   defModSym("AppScreen",  BITS_AppScreen    );
+  // Special (Any Modifier)
+  defModSym("AnyMod",     BITS_AnyMod       );
 }
 
 void KeyTransSymbols::defKeySyms()
--- kdebase-3.4.0/konsole/konsole/TEPty.cpp.konsole	2005-01-23 18:30:46.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/TEPty.cpp	2005-04-18 09:28:15.000000000 +0200
@@ -69,6 +69,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include <termios.h>
                      
 #include <kstandarddirs.h>
 #include <klocale.h>
@@ -98,6 +99,21 @@
   pty()->setUtf8Mode(on);
 }
 
+void TEPty::setErase(char erase)
+{
+  struct termios tios;
+  int fd = pty()->slaveFd();
+  
+  if(tcgetattr(fd, &tios))
+  {
+    qWarning("Uh oh.. can't get terminal attributes..");
+    return;
+  }
+  tios.c_cc[VERASE] = erase;
+  if(tcsetattr(fd, TCSANOW, &tios))
+    qWarning("Uh oh.. can't set terminal attributes..");
+}
+
 /*!
     start the client program.
 */
--- kdebase-3.4.0/konsole/konsole/TEPty.h.konsole	2005-01-23 18:30:46.000000000 +0100
+++ kdebase-3.4.0/konsole/konsole/TEPty.h	2005-04-18 09:28:15.000000000 +0200
@@ -46,6 +46,7 @@
     QString error() { return m_strError; }
     void setXonXoff(bool on);
     void setSize(int lines, int cols);
+    void setErase(char erase);
 
   public slots:
     void useUtf8(bool on);

kdebase-3.4.1-redhat.patch:
 kdebase-3.2.0/kde.pamd |   14 +++++++-----
 kdebase-3.4.0/startkde |   56 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 9 deletions(-)

--- NEW FILE kdebase-3.4.1-redhat.patch ---
--- kdebase-3.2.0/kde.pamd.redhat	1998-06-26 21:58:10.000000000 +0200
+++ kdebase-3.2.0/kde.pamd	2004-02-05 23:23:19.000000000 +0100
@@ -1,7 +1,9 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_pwdb.so shadow nullok
-auth       required	/lib/security/pam_nologin.so
-account    required	/lib/security/pam_pwdb.so
-password   required	/lib/security/pam_cracklib.so
-password   required	/lib/security/pam_pwdb.so shadow nullok use_authtok
-session    required	/lib/security/pam_pwdb.so
+auth       required	pam_stack.so service=system-auth
+auth       required	pam_nologin.so
+auth       sufficient	pam_timestamp.so
+account    required	pam_stack.so service=system-auth
+password   required	pam_stack.so service=system-auth
+session    required	pam_stack.so service=system-auth
+session    optional	pam_timestamp.so
+session    optional	pam_console.so
--- kdebase-3.4.0/startkde.redhat	2005-03-04 06:45:29.000000000 -0500
+++ kdebase-3.4.0/startkde	2005-03-04 11:48:06.597610676 -0500
@@ -1,8 +1,56 @@
 #!/bin/sh
 #
 #  DEFAULT KDE STARTUP SCRIPT ( KDE-3.4.2 )
+#  Modified for Red Hat Linux
 #
 
+unset BLOCK_SIZE # breaks parsing of df output
+shopt -u -o noclobber # allow overwriting of files with '>'
+
+# set up user environment if not present
+# check for space on /tmp and "$HOME" and for write access
+#  error exit, if not
+space_tmp=`df /tmp | xargs | cut -d" " -f11`
+homedir_mount=`df "$HOME" | xargs | cut -d" " -f8`
+
+if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then
+    # check for AFS
+    space_home=`fs df "$HOME" | xargs | cut -d" " -f10`
+else
+    # check regular mounts
+    space_home=`df "$HOME" | xargs | cut -d" " -f11`
+fi
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config
+
+if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then
+  /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults
+fi
+
 # When the X server dies we get a HUP signal from xinit. We must ignore it
 # because we still need to do some cleanup.
 trap 'echo GOT SIGHUP' HUP
@@ -14,12 +62,12 @@
 	exit 1
 fi
 
-# Set the background to plain grey.
+# Set the background to the Red Hat default blue
 # 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 "#C0C0C0"
+  xsetroot -solid "#5477A0"
 fi
 
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
@@ -180,7 +228,8 @@
 echo 'startkde: Starting up...'  1>&2
 
 # run KPersonalizer before the session, if this is the first login
-if kreadconfig --file kpersonalizerrc --group General --key FirstLogin --default true --type bool; then
+if [ ! -f /etc/redhat-release ] ; then
+  if kreadconfig --file kpersonalizerrc --group General --key FirstLogin --default true --type bool; then
     # start only dcopserver, don't start whole kdeinit (takes too long)
     echo 'startkde: Running kpersonalizer...'  1>&2
     dcopserver
@@ -192,6 +241,7 @@
     done
     dcopquit kwin
     dcopserver_shutdown --wait
+  fi
 fi
 
 # the splashscreen and progress indicator


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-3/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	4 Nov 2004 16:54:16 -0000	1.32
+++ .cvsignore	3 Aug 2005 21:43:06 -0000	1.33
@@ -5,3 +5,5 @@
 kde-redhat-config-3.2.0-0.4.tar.bz2
 kde-redhat-config-3.2.0-0.5.tar.bz2
 kde-redhat-config-3.2.0-0.6.tar.bz2
+kde-redhat-config-3.2.0-0.9.tar.bz2
+kdebase-3.4.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-3/kdebase.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- kdebase.spec	28 Apr 2005 14:36:29 -0000	1.83
+++ kdebase.spec	3 Aug 2005 21:43:06 -0000	1.84
@@ -10,76 +10,55 @@
 %define pamservice kde
 %define gdmsession KDE
 
-%define qt_version 3.3.3
-%define arts_version 1.3.1
-%define kde_version 3.3.1
+%define qt_version 3.3.4
+%define arts_version 1.4.2
+%define kde_version 3.4.2
 
 %define libtool 1
 %define arts 1
 
 Summary: K Desktop Environment - core files
 Name: kdebase
-Version: 3.3.1
-Release: 4.4.FC3
+Version: 3.4.2
+Release: 0.fc3.1
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
 License: GPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: konsole.desktop
 Source2: KDE.session.gnome
 Source3: kde.desktop
-Source4: kde-redhat-config-3.2.0-0.6.tar.bz2
+Source4: kde-redhat-config-3.2.0-0.9.tar.bz2
 Source5: kde-np
 Source7: mailsettings.cc
-Source9: start-here.png
-Source13: kcmnspluginrc
 
-Patch0: kdebase-3.3.1-redhat.patch
-Patch3: kdebase-3.1.93-vroot.patch
+Patch0: kdebase-3.4.1-redhat.patch
+Patch3: kdebase-3.3.92-vroot.patch
 Patch4: kdebase-3.0-shortcuts.patch
-Patch5: kdebase-3.2.0-kickermenu.patch
-Patch6: kdebase-3.2.0-motif.patch
-Patch13: kdebase-3.1.95-config.patch
-Patch33: kdebase-3.1.93-monospace.patch
+Patch5: kdebase-3.4.0-fonts.patch
+Patch13: kdebase-3.4.0-config.patch
+Patch33: kdebase-3.4.0-monospace.patch
 Patch40: kdebase-3.2.0-keymap.patch
-Patch46: kdebase-3.1.93-aboutkde.patch
 Patch48: kdebase-3.0.4-kdesukonsole.patch
-Patch53: kdebase-3.1-ssl-krb5.patch
 Patch56: kde-libtool.patch
 Patch57: kdebase-3.1-startpage.patch
 Patch65: kdebase-3.1.1-usb.patch
 Patch71: kdebase-3.1.3-konsole-double-esc.patch
-Patch73: kdebase-3.1.93-starthere.patch
-Patch74: kdebase-3.2.92-kpersonalizer.patch
+Patch74: kdebase-3.3.92-kpersonalizer.patch
 Patch75: kdebase-3.2.0-selinux.patch
 Patch77: kdebase-3.2.2-nedit.patch 
-Patch78: kdebase-3.2.2-urandom.patch
-Patch79: kdebase-3.2.2-pie.patch
 Patch80: kdebase-3.2.92-logo.patch 
 Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff
-Patch82: kdebase-3.3.0-klipper.patch
 Patch83: kdebase-3.3.0-altf2.patch
-Patch85: kdebase-3.3.0-kioslave.patch
-Patch86: kdebase-3.3.1-kxkb.patch
+Patch85: kdebase-3.3.92-fstab.patch
 Patch87: kdebase-3.3.1-man.patch
-Patch88: kdebase-3.3.1-kfind.patch
-Patch89: kdebase-3.3.1-servicebutton-saveas.patch
-
-# rhel
-Patch100: kdebase-3.3.1-kdeprintfax.patch
-
-# CVS fixes
-Patch200: kdebase-3.3.1-cvs.patch
-Patch201: kdebase-3.3.1-sidebar.patch
-
-# security fixes
-# Patch300, KDE Security Advisory: plain text password exposure
-Patch300: post-3.3.1-kdebase-smb.diff
-# Patch202, KDE Security Advisory: Konqueror Window Injection Vulnerability
-Patch301: post-3.3.2-kdebase-htmlframes2.patch
+Patch89: kdebase-3.3.92-servicebutton-saveas.patch
+Patch90: kdebase-3.4.0rc1-konsole-keymap.patch
+Patch91: kdebase-3.4.0-kdesktop-konsole.patch
+Patch92: kdebase-3.4.0-xdg.patch
 
 Requires: kdelibs >= 6:%{version}
 Requires: libxml2 >= 2.6.5
@@ -115,7 +94,9 @@
 BuildPrereq: automake
 BuildPrereq: openssl-devel
 BuildPrereq: pkgconfig
+%ifnarch s390 s390x
 BuildPrereq: libraw1394-devel
+%endif
 
 %description
 Core applications for the K Desktop Environment.  Included are: kdm
@@ -130,7 +111,7 @@
 %package devel
 Summary: Development files for kdebase
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel >= %{version}
+Requires: kdelibs-devel >= %{epoch}:%{version}
 Group: Development/Libraries
 
 %description devel
@@ -142,58 +123,41 @@
 %setup -q
 %patch0 -p1 -b .redhat
 %patch3 -p1 -b .vroot
-%patch4 -p1 -b .short
+%patch4 -p1 -b .shortcuts
+%patch5 -p1 -b .fonts
 %patch13 -p1 -b .config
 %patch33 -p1 -b .fontkonsole
 %patch40 -p1 -b .keymap
-%patch46 -p1 -b .aboutkde
 %patch48 -p1 -b .kdesukonsole
-%patch53 -p1 -b .ssl-krb5
 %patch56 -p1 -b .libtool
 %patch57 -p1
 %patch65 -p1 -b .usb
 %patch71 -p1 -b .konsole
-%patch73 -p1 -b .starthere
 %patch74 -p1 -b .kper
 %patch75 -p1 -b .selinux
 %patch77 -p1 -b .nedit
-%patch78 -p1 -b .urandom
-%if %{pie}
-%patch79 -p1 -b .pie
-%endif
 %patch80 -p1 -b .logo
 %patch81 -p1 -b .im
-%patch82 -p1 -b .klipper
 %patch83 -p1 -b .altf2
 %patch85 -p1 -b .kioslave
-%patch86 -p1 -b .kxxb
 %patch87 -p1 -b .man
-%patch88 -p1 -b .fam
 %patch89 -p1 -b .saveas
+%patch90 -p1 -b .konsole
+%patch91 -p1 -b .kdestop-konsole
+%patch92 -p1 -b .xdg
+%patch93 -p1 -b .loginuid
 
-# RHEL fixes
 %if %{rhel}
-rm -rf kdeprint/kdeprintfax
-%patch100 -p1
+  rm -rf kdeprint/kdeprintfax
+  perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am
 %endif
 
-# CVS fixes
-%patch200 -p1 -b .cvs
-%patch201 -p1 -b .sidebar
-
-# security fixes
-pushd kioslave/smb
-%patch300 -p0 -b .smb
-popd
-%patch301 -p0 -b .html2
-
 %if %redhatify
    cp %{SOURCE1} konsole
    # set Konqueror version
    perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Red Hat\"," konqueror/version.h
 %endif
 
-perl -pi -e "s,#LIB#,%{_lib},g" nsplugins/configure.in.in
 
 %build
 # set some default enviroments
@@ -204,14 +168,18 @@
 export CFLAGS="$FLAGS"
 export KDEDIR=%{_prefix}
 
+%if 0
 if pkg-config openssl ; then
    CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
    CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`"
    CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
    LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
 fi
+%endif
 
-make -f admin/Makefile.common cvs
+%if %{libtool}
+  make -f admin/Makefile.common cvs
+%endif
 
 %configure \
    --with-qt-libraries=$QTDIR/lib \
@@ -410,7 +378,6 @@
 %dir /etc/skel/.kde
 /etc/skel/.kde/*
 /etc/xdg/menus/*
-%config %{_datadir}/config/*
 %config %{_datadir}/xsessions/*
 %config /etc/kderc
 %config /etc/X11/xdm/kdmrc
@@ -420,32 +387,34 @@
 %endif
 %dir %{_libdir}/mozilla
 %dir %{_libdir}/mozilla/plugins
-%{_datadir}/locale/*/entry.desktop
-%{_datadir}/locale/l10n
 %{_bindir}/*
 %{_libdir}/*.??*
 %{_libdir}/kde3/*
 %{_libdir}/kconf_update_bin
-%if ! %{redhatify}
-%{_datadir}/fonts/bitmap-fonts/*
-%endif
-%{_datadir}/wallpapers
-%{_datadir}/applnk
-%{_datadir}/desktop-directories
 %{_datadir}/applications/*
+%{_datadir}/applnk
 %{_datadir}/apps/*
 %{_datadir}/autostart/*
-%{_datadir}/config.kcfg/*
+%config %{_datadir}/config/*
+%{_datadir}/config.kcfg/
+%{_datadir}/desktop-directories
+%if ! %{redhatify}
+%{_datadir}/fonts/bitmap-fonts/*
+%endif
 %{_datadir}/icons/crystalsvg/*/*/*
 %{_datadir}/icons/*color/*/*/*
+%{_datadir}/locale/*/entry.desktop
+%{_datadir}/locale/l10n
+%{_datadir}/mimelnk/application/*
 %{_datadir}/mimelnk/fonts
-%{_datadir}/mimelnk/kdedevice
+%{_datadir}/mimelnk/inode
+%{_datadir}/mimelnk/media
 %{_datadir}/mimelnk/print
-%{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
 %{_datadir}/sounds
 %{_datadir}/templates
+%{_datadir}/wallpapers
 
 %files devel
 %defattr(-,root,root)
@@ -460,6 +429,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Wed Aug 03 2005 Than Ngo <than at redhat.com> 6:3.4.2-0.fc3.1
+- update to 3.4.2
+
 * Thu Apr 28 2005 Than Ngo <than at redhat.com> 6:3.3.1-4.4.FC3
 - add missing kdeprintfax #156204
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-3/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	4 Nov 2004 16:54:16 -0000	1.48
+++ sources	3 Aug 2005 21:43:06 -0000	1.49
@@ -1,2 +1,2 @@
-dd0d9707296f2be143c28a8be21b6e24  kdebase-3.3.1.tar.bz2
-c7133662191e437d61ce743c8a98312f  kde-redhat-config-3.2.0-0.6.tar.bz2
+776b3f900740f021b4df3871e596aa6f  kde-redhat-config-3.2.0-0.9.tar.bz2
+0ea16eb7185ef014d8bd4da4f4530272  kdebase-3.4.2.tar.bz2


--- kcmnspluginrc DELETED ---


--- kdebase-3.1-ssl-krb5.patch DELETED ---


--- kdebase-3.1.93-aboutkde.patch DELETED ---


--- kdebase-3.1.93-monospace.patch DELETED ---


--- kdebase-3.1.93-starthere.patch DELETED ---


--- kdebase-3.1.93-vroot.patch DELETED ---


--- kdebase-3.1.95-config.patch DELETED ---


--- kdebase-3.2.0-kickermenu.patch DELETED ---


--- kdebase-3.2.0-motif.patch DELETED ---


--- kdebase-3.2.2-pie.patch DELETED ---


--- kdebase-3.2.2-urandom.patch DELETED ---


--- kdebase-3.2.92-kpersonalizer.patch DELETED ---


--- kdebase-3.3.0-kioslave.patch DELETED ---


--- kdebase-3.3.0-klipper.patch DELETED ---


--- kdebase-3.3.1-cvs.patch DELETED ---


--- kdebase-3.3.1-kdeprintfax.patch DELETED ---


--- kdebase-3.3.1-kfind.patch DELETED ---


--- kdebase-3.3.1-redhat.patch DELETED ---


--- kdebase-3.3.1-servicebutton-saveas.patch DELETED ---


--- kdebase-3.3.1-sidebar.patch DELETED ---


--- post-3.3.1-kdebase-smb.diff DELETED ---


--- post-3.3.2-kdebase-htmlframes2.patch DELETED ---




More information about the fedora-cvs-commits mailing list