rpms/kdebase/devel kdebase-3.92.0-kde4home.diff, NONE, 1.1.2.1 kdebase.spec, 1.263.2.5, 1.263.2.6 kdebase-3.91.0-kde4home.diff, 1.1.2.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Sun Jul 29 19:17:23 UTC 2007 

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15091

Modified Files:
      Tag: kdebase-kde4-branch
	kdebase.spec 
Added Files:
      Tag: kdebase-kde4-branch
	kdebase-3.92.0-kde4home.diff 
Removed Files:
      Tag: kdebase-kde4-branch
	kdebase-3.91.0-kde4home.diff 
Log Message:
update description
cleanup BR's
update kde4home patch


kdebase-3.92.0-kde4home.diff:

--- NEW FILE kdebase-3.92.0-kde4home.diff ---
diff -ur kdebase-3.92.0/apps/dolphin/src/README kdebase-3.92.0-kde4home/apps/dolphin/src/README
--- kdebase-3.92.0/apps/dolphin/src/README	2007-02-19 10:52:01.000000000 +0100
+++ kdebase-3.92.0-kde4home/apps/dolphin/src/README	2007-07-29 17:03:26.000000000 +0200
@@ -69,7 +69,7 @@
  http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/
 2. Install that gettext in ~/bin/
 3. cd ~/yourproject, export PATH=~/bin:$PATH, export
-KDEDIR=/where_your_KDE3_is
+KDE4DIR=/where_your_KDE3_is
 4. make -f admin/Makefile.common package-messages
 5. make package-messages
 6. Translate the po files (not the pot!!) with kbabel or xemacs
diff -ur kdebase-3.92.0/apps/keditbookmarks/TODO kdebase-3.92.0-kde4home/apps/keditbookmarks/TODO
--- kdebase-3.92.0/apps/keditbookmarks/TODO	2006-10-26 04:10:00.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/keditbookmarks/TODO	2007-07-29 17:03:27.000000000 +0200
@@ -7,7 +7,7 @@
    - nothing to do with bookmarks, but, no idea where to put it,
      so, whatever, i'll handle it anyways...
      
-   - problem: .kde/share/cache/favicons moved to .kde/`hostname`-cache/favicons
+   - problem: .kde4/share/cache/favicons moved to .kde4/`hostname`-cache/favicons
 
    - fix: either 1) a symlink, 2) upgrade path
 
@@ -18,7 +18,7 @@
    - can't reproduce... maybe a new / old qt bug...
 
 67686 : bookmark bar first displayed empty 
-   - can't reproduce, maybe need to check from an empty .kde, thus no previous
+   - can't reproduce, maybe need to check from an empty .kde4, thus no previous
 
 67958 : bookmark toolbar intermittenly disappears 
    - maybe just another dup of tokoe's bug
diff -ur kdebase-3.92.0/apps/konqueror/client/kfmclient.cpp kdebase-3.92.0-kde4home/apps/konqueror/client/kfmclient.cpp
--- kdebase-3.92.0/apps/konqueror/client/kfmclient.cpp	2007-07-26 12:36:08.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konqueror/client/kfmclient.cpp	2007-07-29 17:03:27.000000000 +0200
@@ -104,7 +104,7 @@
 
     puts(i18n("  kfmclient openProfile 'profile' ['url']\n"
                 "            # Opens a window using the given profile.\n"
-                "            #   'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n"
+                "            #   'profile' is a file under ~/.kde4/share/apps/konqueror/profiles.\n"
                 "            #   'url' is an optional URL to open.\n\n").toLocal8Bit());
 
     return 0;
diff -ur kdebase-3.92.0/apps/konqueror/convert_kdelnk.sh kdebase-3.92.0-kde4home/apps/konqueror/convert_kdelnk.sh
--- kdebase-3.92.0/apps/konqueror/convert_kdelnk.sh	2007-05-03 10:38:44.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konqueror/convert_kdelnk.sh	2007-06-28 01:25:48.000000000 +0200
@@ -3,7 +3,7 @@
 # Converts all user's .kdelnk files to .desktop
 # Necessary to avoid duplication when saving a mimetype or an applnk
 
-find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print |
+find ~/.kde4/share/mimelnk ~/.kde4/share/applnk -name "*.kdelnk" -print |
  while read k; do
   d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`
   echo "Renaming $k to $d"
@@ -11,7 +11,7 @@
  done
 
 # Convert user's bookmarks to .desktop and to remove .xpm from icons
-find ~/.kde/share/apps/kfm/bookmarks -type f -print |
+find ~/.kde4/share/apps/kfm/bookmarks -type f -print |
  while read k; do
   if echo $k | grep -q kdelnk; then  # kdelnk file
     d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'`
diff -ur kdebase-3.92.0/apps/konqueror/src/konqmainwindow.cpp kdebase-3.92.0-kde4home/apps/konqueror/src/konqmainwindow.cpp
--- kdebase-3.92.0/apps/konqueror/src/konqmainwindow.cpp	2007-07-26 12:36:03.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konqueror/src/konqmainwindow.cpp	2007-07-29 17:03:28.000000000 +0200
@@ -5860,7 +5860,7 @@
     if( mainWindowList()->count() > 1 )
         return false;
     // not running in full KDE environment?
-    if( getenv( "KDE_FULL_SESSION" ) == NULL || getenv( "KDE_FULL_SESSION" )[ 0 ] == '\0' )
+    if( getenv( "KDE4_FULL_SESSION" ) == NULL || getenv( "KDE4_FULL_SESSION" )[ 0 ] == '\0' )
         return false;
     // not the same user like the one running the session (most likely we're run via sudo or something)
     if( getenv( "KDE_SESSION_UID" ) != NULL && uid_t( atoi( getenv( "KDE_SESSION_UID" ))) != getuid())
diff -ur kdebase-3.92.0/apps/konsole/data/color-schemes/historic/README.Schema kdebase-3.92.0-kde4home/apps/konsole/data/color-schemes/historic/README.Schema
--- kdebase-3.92.0/apps/konsole/data/color-schemes/historic/README.Schema	2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konsole/data/color-schemes/historic/README.Schema	2007-07-29 17:03:28.000000000 +0200
@@ -2,8 +2,8 @@
 
 The schemata offered in the Options/Schema menu are
 taken from from configurations files with a *.schema
-pattern either located in $KDEDIR/share/apps/konsole
-or ~/.kde/share/apps/konsole.
+pattern either located in $KDE4DIR/share/apps/konsole
+or ~/.kde4/share/apps/konsole.
 
 Schemata allow to configure the color set that konsole
 uses, together with some more information on rendition
diff -ur kdebase-3.92.0/apps/konsole/data/keyboard-layouts/README.KeyTab kdebase-3.92.0-kde4home/apps/konsole/data/keyboard-layouts/README.KeyTab
--- kdebase-3.92.0/apps/konsole/data/keyboard-layouts/README.KeyTab	2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konsole/data/keyboard-layouts/README.KeyTab	2007-07-29 17:03:28.000000000 +0200
@@ -2,8 +2,8 @@
 
 The keytabs offered in the Options/Keyboard menu are
 taken from from configurations files with a *.keytab
-pattern either located in $KDEDIR/share/apps/konsole
-or ~/.kde/share/apps/konsole.
+pattern either located in $KDE4DIR/share/apps/konsole
+or ~/.kde4/share/apps/konsole.
 
 Keytabs allow to configure the behavior of konsole
 on keyboard events, especially for functions keys.
diff -ur kdebase-3.92.0/apps/konsole/developer-doc/old-documents/Konsole2.Requirements kdebase-3.92.0-kde4home/apps/konsole/developer-doc/old-documents/Konsole2.Requirements
--- kdebase-3.92.0/apps/konsole/developer-doc/old-documents/Konsole2.Requirements	2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konsole/developer-doc/old-documents/Konsole2.Requirements	2007-07-29 17:03:28.000000000 +0200
@@ -22,7 +22,7 @@
 
 - connection/disconnect session to/from individual windows
 
-- gui style configuration for $KDEDIR/share/apps/konsole/*
+- gui style configuration for $KDE4DIR/share/apps/konsole/*
 
 - improved history algorithm
 
diff -ur kdebase-3.92.0/apps/konsole/user-doc/OLD-NEWS kdebase-3.92.0-kde4home/apps/konsole/user-doc/OLD-NEWS
--- kdebase-3.92.0/apps/konsole/user-doc/OLD-NEWS	2006-10-26 04:10:04.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konsole/user-doc/OLD-NEWS	2007-07-29 17:03:29.000000000 +0200
@@ -100,7 +100,7 @@
 
 - One may use a background pixmap with konsole, now. This feature is 
   experimental.  It originates from Eterm. To try this, move a pixmap named
-  `konsole.ppm' to $HOME/.kde/apps/konsole to try it.  It can be anything
+  `konsole.ppm' to $HOME/.kde4/apps/konsole to try it.  It can be anything
   that QPixmap::load is able to read.  You can get pixmaps from the Eterm
   background tar balls. I've put some into the 'other/' directory, too. Note
   that you need to set fore- and background colors that matches the color of
diff -ur kdebase-3.92.0/apps/konsole/user-doc/README.keyboard kdebase-3.92.0-kde4home/apps/konsole/user-doc/README.keyboard
--- kdebase-3.92.0/apps/konsole/user-doc/README.keyboard	2006-10-26 04:10:04.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/konsole/user-doc/README.keyboard	2007-07-29 17:03:29.000000000 +0200
@@ -1,6 +1,6 @@
 [README.keyboard]
 
-The *.keytab files (located in $KDEDIR/share/apps/konsole) allow
+The *.keytab files (located in $KDE4DIR/share/apps/konsole) allow
 to configure the keyboard due to your specific environment.
 
 Beside that you can use them to make the keyboard emit virtually
diff -ur kdebase-3.92.0/apps/lib/konq/favicons/favicons.upd kdebase-3.92.0-kde4home/apps/lib/konq/favicons/favicons.upd
--- kdebase-3.92.0/apps/lib/konq/favicons/favicons.upd	2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/lib/konq/favicons/favicons.upd	2007-07-29 17:03:29.000000000 +0200
@@ -1,3 +1,3 @@
-# Move favicons from $KDEHOME/share/icons and $KDEHOME/share/cache to $KDEHOME/cache-$HOST
+# Move favicons from $KDE4HOME/share/icons and $KDE4HOME/share/cache to $KDE4HOME/cache-$HOST
 Id=kde3_2
 Script=move_favicons.sh,sh
diff -ur kdebase-3.92.0/apps/lib/konq/knewmenu.cpp kdebase-3.92.0-kde4home/apps/lib/konq/knewmenu.cpp
--- kdebase-3.92.0/apps/lib/konq/knewmenu.cpp	2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/lib/konq/knewmenu.cpp	2007-06-28 01:28:40.000000000 +0200
@@ -360,7 +360,7 @@
                   this, SLOT ( slotFillTemplates() ) );
         connect ( s_pDirWatch, SIGNAL( deleted( const QString & ) ),
                   this, SLOT ( slotFillTemplates() ) );
-        // Ok, this doesn't cope with new dirs in KDEDIRS, but that's another story
+        // Ok, this doesn't cope with new dirs in KDE4DIRS, but that's another story
     }
     ++s_templatesVersion;
     s_filesParsed = false;
diff -ur kdebase-3.92.0/apps/lib/konq/SERVICEMENUS kdebase-3.92.0-kde4home/apps/lib/konq/SERVICEMENUS
--- kdebase-3.92.0/apps/lib/konq/SERVICEMENUS	2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/lib/konq/SERVICEMENUS	2007-07-29 17:03:29.000000000 +0200
@@ -12,7 +12,7 @@
 
 How
 ===
-Create a file ~/.kde/share/apps/konqueror/servicemenus/something.desktop
+Create a file ~/.kde4/share/apps/konqueror/servicemenus/something.desktop
 and write into it something like (without the comments) :
 
 [Desktop Entry]
diff -ur kdebase-3.92.0/apps/lib/konq/tests/favicontest.cpp kdebase-3.92.0-kde4home/apps/lib/konq/tests/favicontest.cpp
--- kdebase-3.92.0/apps/lib/konq/tests/favicontest.cpp	2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/lib/konq/tests/favicontest.cpp	2007-07-29 17:03:29.000000000 +0200
@@ -134,7 +134,7 @@
 
 #if 0
 // downloadHostIcon does nothing if the icon is available already, so how to test this?
-// We could delete the icon first, but given that we have a different KDEHOME than the kded module,
+// We could delete the icon first, but given that we have a different KDE4HOME than the kded module,
 // that's not really easy...
 void FavIconTest::testDownloadHostIcon()
 {
diff -ur kdebase-3.92.0/apps/lib/konq/tests/konqundomanagertest.cpp kdebase-3.92.0-kde4home/apps/lib/konq/tests/konqundomanagertest.cpp
--- kdebase-3.92.0/apps/lib/konq/tests/konqundomanagertest.cpp	2007-07-26 12:36:09.000000000 +0200
+++ kdebase-3.92.0-kde4home/apps/lib/konq/tests/konqundomanagertest.cpp	2007-07-29 17:03:29.000000000 +0200
@@ -38,7 +38,7 @@
 
 QTEST_KDEMAIN( KonqUndoManagerTest, NoGUI )
 
-static QString homeTmpDir() { return QFile::decodeName( getenv( "KDEHOME" ) ) + "/jobtest/"; }
+static QString homeTmpDir() { return QFile::decodeName( getenv( "KDE4HOME" ) ) + "/jobtest/"; }
 static QString destDir() { return homeTmpDir() + "destdir/"; }
 
 static QString srcFile() { return homeTmpDir() + "testfile"; }
diff -ur kdebase-3.92.0/apps/nsplugins/HOWTO.DEBUG kdebase-3.92.0-kde4home/apps/nsplugins/HOWTO.DEBUG
--- kdebase-3.92.0/apps/nsplugins/HOWTO.DEBUG	2007-06-27 12:43:07.000000000 +0200
[...1948 lines suppressed...]
@@ -138,7 +138,7 @@
                 << "=\"" << value.replace( "\"", "\\\"" ) << "\"\n";
             }
         startupconfigfiles << line << endl;
-        // use even currently non-existing paths in $KDEDIRS
+        // use even currently non-existing paths in $KDE4DIRS
         QStringList dirs = KGlobal::dirs()->kfsstnd_prefixes().split( KPATH_SEPARATOR, QString::SkipEmptyParts);
         for( QStringList::ConstIterator it = dirs.begin();
              it != dirs.end();
diff -ur kdebase-3.92.0/workspace/kstartupconfig/kstartupconfig.cpp kdebase-3.92.0-kde4home/workspace/kstartupconfig/kstartupconfig.cpp
--- kdebase-3.92.0/workspace/kstartupconfig/kstartupconfig.cpp	2007-06-27 12:45:50.000000000 +0200
+++ kdebase-3.92.0-kde4home/workspace/kstartupconfig/kstartupconfig.cpp	2007-07-29 17:03:38.000000000 +0200
@@ -28,10 +28,10 @@
 without the need to launch anything linked to KDE libraries (which may need
 some time to load).
 
-The configuration options are written to $KDEHOME/share/config/startupconfigkeys,
+The configuration options are written to $KDE4HOME/share/config/startupconfigkeys,
 one option per line, as <file> <group> <key> <default>. It is possible to
 use ' for quoting multiword entries. Values of these options will be written
-to $KDEHOME/share/config/startupconfig as a shell script that will set
+to $KDE4HOME/share/config/startupconfig as a shell script that will set
 the values to shell variables, named <file>_<group>_<key> (all spaces replaced
 by underscores, everything lowercase). So e.g. line
 "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
@@ -76,12 +76,12 @@
 int main()
     {
     char kdehome[ 1024 ];
-    if( getenv( "KDEHOME" ))
-        strlcpy( kdehome, getenv( "KDEHOME" ), 1024 );
+    if( getenv( "KDE4HOME" ))
+        strlcpy( kdehome, getenv( "KDE4HOME" ), 1024 );
     else if( getenv( "HOME" ))
         {
         strlcpy( kdehome, getenv( "HOME" ), 1024 );
-        strlcat( kdehome, "/.kde", 1024  );
+        strlcat( kdehome, "/.kde4", 1024  );
         }
     else
         return 1;
diff -ur kdebase-3.92.0/workspace/ktip/tips kdebase-3.92.0-kde4home/workspace/ktip/tips
--- kdebase-3.92.0/workspace/ktip/tips	2007-06-27 12:45:50.000000000 +0200
+++ kdebase-3.92.0-kde4home/workspace/ktip/tips	2007-07-29 17:03:39.000000000 +0200
@@ -630,7 +630,7 @@
 kprinter -d infotec \
    /home/kurt/paragliding.jpg \
    ../kdeprint-handbook.pdf \
-   /opt/kde3/flyer.ps
+   /opt/kde4/flyer.ps
 </pre>
  This prints 3 different files (from different folders) to printer "infotec".
  </p>
diff -ur kdebase-3.92.0/workspace/kwin/CONFIGURING kdebase-3.92.0-kde4home/workspace/kwin/CONFIGURING
--- kdebase-3.92.0/workspace/kwin/CONFIGURING	2007-05-03 10:38:22.000000000 +0200
+++ kdebase-3.92.0-kde4home/workspace/kwin/CONFIGURING	2007-07-29 17:03:39.000000000 +0200
@@ -36,14 +36,14 @@
 it manually for every user (for example when doing a large deployment), follow
 these steps:
 
-- Back up your $KDEHOME/share/config/kwinrulesrc ($KDEHOME usually being $HOME/.kde)
+- Back up your $KDE4HOME/share/config/kwinrulesrc ($KDE4HOME usually being $HOME/.kde4)
  and remove it
 - Run 'dcop kwin default reconfigure'
 - Create manually all window-specific settings that should be included (see above)
 - When done, check in Window-specific settings configuration module
  (Alt+F3/Configure window behavior/Window-specific settings) that all rules are
  included
-- Create a copy of $KDEHOME/share/config/kwinrulesrc and restore the original one
+- Create a copy of $KDE4HOME/share/config/kwinrulesrc and restore the original one
 - Rename the copy (i.e. the newly created kwinrulesrc) to have its unique name
  (e.g. foobar_fix_maxsize in this example case)
 - Be careful with manual modifications of the file, especially make sure the count=
@@ -62,9 +62,9 @@
 # kwin_foobar_fix_maxsize.upd end # 
 
 - The kconfig_file (kwin_foobar_fix_maxsize.upd) is to be placed
- in $KDEDIR/share/apps/kconf_update/
+ in $KDE4DIR/share/apps/kconf_update/
 - The file with the window-specific settings (foobar_fix_maxsize) is to be placed
- in $KDEDIR/share/apps/kwin/default_rules/
+ in $KDE4DIR/share/apps/kwin/default_rules/
 
 
 All KDE user accounts should have these new window-specific settings added
diff -ur kdebase-3.92.0/workspace/startkde kdebase-3.92.0-kde4home/workspace/startkde
--- kdebase-3.92.0/workspace/startkde	2007-07-26 12:37:17.000000000 +0200
+++ kdebase-3.92.0-kde4home/workspace/startkde	2007-07-29 17:03:40.000000000 +0200
@@ -52,11 +52,11 @@
 #
 # * Then ksmserver is started which takes control of the rest of the startup sequence
 
-# The user's personal KDE directory is usually ~/.kde, but this setting
-# may be overridden by setting KDEHOME.
+# The user's personal KDE directory is usually ~/.kde4, but this setting
+# may be overridden by setting KDE4HOME.
 
-kdehome=$HOME/.kde
-test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
+kdehome=$HOME/.kde4
+test -n "$KDE4HOME" && kdehome=`echo "$KDE4HOME"|sed "s,^~/,$HOME/,"`
 
 # see kstartupconfig source for usage
 mkdir -m 700 -p $kdehome
@@ -168,7 +168,7 @@
 fi
 
 # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
-# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
+# (where <localprefix> is $KDE4HOME or ~/.kde4, and <prefixes> is where KDE is installed)
 #
 # This is where you can define environment variables that will be available to
 # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
@@ -207,13 +207,13 @@
 usr_odir=$HOME/.fonts/kde-override
 usr_fdir=$HOME/.fonts
 
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+if test -n "$KDE4DIRS"; then
+  kdedirs_first=`echo "$KDE4DIRS"|sed -e 's/:.*//'`
   sys_odir=$kdedirs_first/share/fonts/override
   sys_fdir=$kdedirs_first/share/fonts
 else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
+  sys_odir=$KDE4DIR/share/fonts/override
+  sys_fdir=$KDE4DIR/share/fonts
 fi
 
 # We run mkfontdir on the user's font dirs (if we have permission) to pick
@@ -256,9 +256,9 @@
 
 # Link "tmp" "socket" and "cache" resources to directory in /tmp
 # Creates:
-# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
-# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
-# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
+# - a directory /tmp/kde-$USER and links $KDE4HOME/tmp-$HOSTNAME to it.
+# - a directory /tmp/ksocket-$USER and links $KDE4HOME/socket-$HOSTNAME to it.
+# - a directory /var/tmp/kdecache-$USER and links $KDE4HOME/cache-$HOSTNAME to it.
 # Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
 # environment variables
 for resource in tmp cache socket; do
@@ -292,26 +292,26 @@
 
 
 # Mark that full KDE session is running (e.g. Konqueror preloading works only
-# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# with full KDE running). The KDE4_FULL_SESSION property can be detected by
 # any X client connected to the same X session, even if not launched
-# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE4_FULL_SESSION
 # however guarantees that the application is launched in the same environment
 # like the KDE session and that e.g. KDE utilities/libraries are available.
-# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# KDE4_FULL_SESSION property is also only available since KDE 3.5.5.
 # The matching tests are:
-#   For $KDE_FULL_SESSION:
-#     if test -n "$KDE_FULL_SESSION"; then ... whatever
-#   For KDE_FULL_SESSION property:
-#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#   For $KDE4_FULL_SESSION:
+#     if test -n "$KDE4_FULL_SESSION"; then ... whatever
+#   For KDE4_FULL_SESSION property:
+#     xprop -root | grep "^KDE4_FULL_SESSION" >/dev/null 2>/dev/null
 #     if test $? -eq 0; then ... whatever
 #
 # Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
 # of the user running the KDE session. It should be rarely needed (e.g.
 # after sudo to prevent desktop-wide functionality in the new user's kded).
 #
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+KDE4_FULL_SESSION=true
+export KDE4_FULL_SESSION
+xprop -root -f KDE4_FULL_SESSION 8t -set KDE4_FULL_SESSION true
 
 KDE_SESSION_VERSION=4
 export KDE_SESSION_VERSION
@@ -368,15 +368,15 @@
 
 echo 'startkde: Running shutdown scripts...'  1>&2
 
-# Run scripts found in $KDEDIRS/shutdown
+# Run scripts found in $KDE4DIRS/shutdown
 for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
     test -x "$prefix$file" && "$prefix$file"
   done
 done
 
-unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+unset KDE4_FULL_SESSION
+xprop -root -remove KDE4_FULL_SESSION
 unset KDE_SESSION_VERSION
 xprop -root -remove KDE_SESSION_VERSION
 unset KDE_SESSION_UID


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263.2.5
retrieving revision 1.263.2.6
diff -u -r1.263.2.5 -r1.263.2.6
--- kdebase.spec	29 Jul 2007 02:27:21 -0000	1.263.2.5
+++ kdebase.spec	29 Jul 2007 19:16:50 -0000	1.263.2.6
@@ -40,67 +40,75 @@
 Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
 
+BuildRequires: automake libtool
+BuildRequires: bluez-libs-devel
+BuildRequires: bzip2-devel
+BuildRequires: cdparanoia-devel cdparnoia
 BuildRequires: cmake
+BuildRequires: cyrus-sasl-devel
+BuildRequires: doxygen
+BuildRequires: imake
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
+BuildRequires: gettext
+BuildRequires: hal-devel dbus-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: xorg-x11-proto-devel libXcomposite-devel libXdamage-devel
-BuildRequires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
-BuildRequires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-BuildRequires: libXScrnSaver-devel libXtst-devel imake
-BuildRequires: xorg-x11-font-utils libXinerama-devel libfontenc-devel
-BuildRequires: fontconfig-devel
-BuildRequires: pam-devel gettext
-BuildRequires: cdparanoia cdparanoia-devel freetype-devel openldap-devel
-BuildRequires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-BuildRequires: dbus-devel hal-devel NetworkManager-devel bluez-libs-devel
-BuildRequires: strigi-devel zlib-devel bzip2-devel libpng-devel
-
-BuildRequires: automake libtool pkgconfig doxygen
-
-%if 0%{?fedora} > 6 || 0%{?rhel} > 5
-BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba 
-%endif
-
-BuildRequires: libxklavier-devel >= 2.91 glib2-devel
-
+BuildRequires: libart_lgpl-devel
+BuildRequires: libfontenc-devel
+BuildRequires: libpng-devel
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 %endif
-%ifarch alpha %{ix86} x86_64
-BuildRequires: lm_sensors-devel
+BuildRequires: libusb-devel
+BuildRequires: libxklavier-devel >= 2.91 glib2-devel
+BuildRequires: libXcomposite-devel libXcursor-devel libXdamage-devel
+BuildRequires: libXext-devel libXfixes-devel libXinerama-devel
+BuildRequires: libXrandr-devel libXrender-devel libXres-devel
+BuildRequires: libXScrnSaver-devel libXtst-devel
+BuildRequires: libXxf86misc-devel
+BuildRequires: lmsensors-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+# samba support
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
+BuildRequires: libsmbclient-devel
+%else
+BuildRequires: samba
 %endif
+BuildRequires: strigi-devel
+BuildRequires: xorg-x11-font-utils xorg-x11-proto-devel
+BuildRequires: zlib-devel
 
 %description
 Core applications for the K Desktop Environment 4.
-WARNING: This is an beta version. It probably has many bugs left.
+WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 %package devel
 Group:    Development/Libraries
 Summary:  Header files for kdebase4
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
 # FIXME/TODO: trim these down -- Rex
-Requires: xorg-x11-proto-devel libXcomposite-devel libXdamage-devel
+Requires: libXcomposite-devel libXdamage-devel
 Requires: libXcursor-devel libXfixes-devel libXxf86misc-devel libXrender-devel
 Requires: libXrandr-devel libXext-devel libusb-devel libXres-devel
-Requires: libXScrnSaver-devel libXtst-devel imake
-Requires: xorg-x11-font-utils libXinerama-devel libfontenc-devel
-Requires: fontconfig-devel
-Requires: pam-devel gettext
-Requires: cdparanoia cdparanoia-devel freetype-devel openldap-devel
+Requires: libXScrnSaver-devel libXtst-devel
+Requires: libXinerama-devel libfontenc-devel
 Requires: cyrus-sasl-devel libart_lgpl-devel openssl-devel
-Requires: dbus-devel hal-devel NetworkManager-devel bluez-libs-devel
+Requires: hal-devel NetworkManager-devel bluez-libs-devel
 Requires: strigi-devel zlib-devel bzip2-devel libpng-devel
 %description devel
 Header files for developing applications using %{name}.
-WARNING: This is an beta version. It probably has many bugs left.
+WARNING: This is a beta version. It probably has many bugs left.
 Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 


--- kdebase-3.91.0-kde4home.diff DELETED ---

More information about the fedora-extras-commits mailing list