rpms/kdebase/devel kde-env.sh, NONE, 1.1.2.1 kdebase-3.91.0-kde4home.diff, NONE, 1.1.2.1 .cvsignore, 1.57, 1.57.2.1 kdebase.spec, 1.263, 1.263.2.1 sources, 1.78, 1.78.2.1 KDE.session.gnome, 1.1, NONE cr16-app-package_games_kids.png, 1.1, NONE cr32-app-package_games_kids.png, 1.1, NONE cr48-app-package_games_kids.png, 1.1, NONE env.sh, 1.5, NONE kde-legacy.pamd, 1.1, NONE kde-np-legacy.pamd, 1.1, NONE kde-np.pamd, 1.1, NONE kde.desktop, 1.2, NONE kde.pamd, 1.1, NONE kdebase-3.1-startpage.patch, 1.1, NONE kdebase-3.1.3-konsole-double-esc.patch, 1.1, NONE kdebase-3.2.0-keymap.patch, 1.1, NONE kdebase-3.2.92-logo.patch, 1.1, NONE kdebase-3.3.1-pam_krb5-bz#191049.patch, 1.1, NONE kdebase-3.3.92-kpersonalizer.patch, 1.2, NONE kdebase-3.3.92-vroot.patch, 1.2, NONE kdebase-3.4.2-kdesktop-konsole.patch, 1.1, NONE kdebase-3.5.1-kdm-readme.patch, 1.1, NONE kdebase-3.5.1-konsole-fonts.patch, 1.1, NONE kdebase-3.5.1-xdg.patch, 1.1, NONE kdebase-3.5.2-kconf_update-klipper.patch, 1.1, NONE kdebase-3.5.3-khelpcenter-sort.patch, 1.1, NONE kdebase-3.5.4-htdig.patch, 1.1, NONE kdebase-3.5.4-konqueror-shortcut.patch, 1.1, NONE kdebase-3.5.4-tango-icon-theme.patch, 1.1, NONE kdebase-3.5.5-dbus.patch, 1.1, NONE kdebase-3.5.5-keyinit.patch, 1.1, NONE kdebase-3.5.5-redhat-pam.patch, 1.1, NONE kdebase-3.5.5-suspend.patch, 1.1, NONE kdebase-3.5.6-consolekit-kdm.patch, 1.2, NONE kdebase-3.5.6-kdm-alternatebackground.patch, 1.1, NONE kdebase-3.5.7-1-redhat-startkde.patch, 1.1, NONE kdebase-3.5.7-bz#244906.patch, 1.1, NONE kdebase-3.5.7-kde#83974.patch, 1.1, NONE kdebase-3.x-shortcuts.patch, 1.1, NONE kderc, 1.1, NONE konsole.desktop, 1.2, NONE logrotate-kdm, 1.1, NONE mailsettings.cc, 1.2, NONE
Than Ngo (than)
fedora-extras-commits at redhat.com
Tue Jul 24 14:29:32 UTC 2007
Author: than
Update of /cvs/extras/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3731
Modified Files:
Tag: kdebase-kde4-branch
.cvsignore kdebase.spec sources
Added Files:
Tag: kdebase-kde4-branch
kde-env.sh kdebase-3.91.0-kde4home.diff
Removed Files:
Tag: kdebase-kde4-branch
KDE.session.gnome cr16-app-package_games_kids.png
cr32-app-package_games_kids.png
cr48-app-package_games_kids.png env.sh kde-legacy.pamd
kde-np-legacy.pamd kde-np.pamd kde.desktop kde.pamd
kdebase-3.1-startpage.patch
kdebase-3.1.3-konsole-double-esc.patch
kdebase-3.2.0-keymap.patch kdebase-3.2.92-logo.patch
kdebase-3.3.1-pam_krb5-bz#191049.patch
kdebase-3.3.92-kpersonalizer.patch kdebase-3.3.92-vroot.patch
kdebase-3.4.2-kdesktop-konsole.patch
kdebase-3.5.1-kdm-readme.patch
kdebase-3.5.1-konsole-fonts.patch kdebase-3.5.1-xdg.patch
kdebase-3.5.2-kconf_update-klipper.patch
kdebase-3.5.3-khelpcenter-sort.patch kdebase-3.5.4-htdig.patch
kdebase-3.5.4-konqueror-shortcut.patch
kdebase-3.5.4-tango-icon-theme.patch kdebase-3.5.5-dbus.patch
kdebase-3.5.5-keyinit.patch kdebase-3.5.5-redhat-pam.patch
kdebase-3.5.5-suspend.patch kdebase-3.5.6-consolekit-kdm.patch
kdebase-3.5.6-kdm-alternatebackground.patch
kdebase-3.5.7-1-redhat-startkde.patch
kdebase-3.5.7-bz#244906.patch kdebase-3.5.7-kde#83974.patch
kdebase-3.x-shortcuts.patch kderc konsole.desktop
logrotate-kdm mailsettings.cc
Log Message:
kdebase 4 alpha2
--- NEW FILE kde-env.sh ---
## from http://standards.freedesktop.org/menu-spec/latest/
## XDG_CONFIG_DIRS: where to look for menu config(s)
#if [ -z "${XDG_CONFIG_DIRS}" ] ; then
XDG_CONFIG_DIRS=/etc/xdg:${XDG_CONFIG_DIRS}
export XDG_CONFIG_DIRS
#fi
## XDG_MENU_PREFIX
#if [ -z "${XDG_MENU_PREFIX}" ] ; then
XDG_MENU_PREFIX="kde-"
export XDG_MENU_PREFIX
#fi
#LD_LIBRARY_PATH=/opt/kde4/lib
#KDEDIR=/opt/kde4
#PATH=/opt/kde4/bin/:$PATH
#KDEHOME=~/.kde4
kdebase-3.91.0-kde4home.diff:
--- NEW FILE kdebase-3.91.0-kde4home.diff ---
diff -ur kdebase-3.91.0/apps/dolphin/src/README kdebase-3.91.0-kde4home/apps/dolphin/src/README
--- kdebase-3.91.0/apps/dolphin/src/README 2007-02-19 10:52:01.000000000 +0100
+++ kdebase-3.91.0-kde4home/apps/dolphin/src/README 2007-06-27 23:08:57.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.91.0/apps/keditbookmarks/TODO kdebase-3.91.0-kde4home/apps/keditbookmarks/TODO
--- kdebase-3.91.0/apps/keditbookmarks/TODO 2006-10-26 04:10:00.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/keditbookmarks/TODO 2007-06-27 23:08:58.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.91.0/apps/konqueror/client/kfmclient.cpp kdebase-3.91.0-kde4home/apps/konqueror/client/kfmclient.cpp
--- kdebase-3.91.0/apps/konqueror/client/kfmclient.cpp 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konqueror/client/kfmclient.cpp 2007-06-27 23:08:58.000000000 +0200
@@ -102,7 +102,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.91.0/apps/konqueror/convert_kdelnk.sh kdebase-3.91.0-kde4home/apps/konqueror/convert_kdelnk.sh
--- kdebase-3.91.0/apps/konqueror/convert_kdelnk.sh 2007-05-03 10:38:44.000000000 +0200
+++ kdebase-3.91.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.91.0/apps/konqueror/src/konqmainwindow.cpp kdebase-3.91.0-kde4home/apps/konqueror/src/konqmainwindow.cpp
--- kdebase-3.91.0/apps/konqueror/src/konqmainwindow.cpp 2007-06-27 12:43:31.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konqueror/src/konqmainwindow.cpp 2007-06-27 23:08:58.000000000 +0200
@@ -5847,7 +5847,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.91.0/apps/konsole/data/color-schemes/historic/README.Schema kdebase-3.91.0-kde4home/apps/konsole/data/color-schemes/historic/README.Schema
--- kdebase-3.91.0/apps/konsole/data/color-schemes/historic/README.Schema 2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konsole/data/color-schemes/historic/README.Schema 2007-06-27 23:08:58.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.91.0/apps/konsole/data/keyboard-layouts/README.KeyTab kdebase-3.91.0-kde4home/apps/konsole/data/keyboard-layouts/README.KeyTab
--- kdebase-3.91.0/apps/konsole/data/keyboard-layouts/README.KeyTab 2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konsole/data/keyboard-layouts/README.KeyTab 2007-06-27 23:08:59.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.91.0/apps/konsole/developer-doc/old-documents/Konsole2.Requirements kdebase-3.91.0-kde4home/apps/konsole/developer-doc/old-documents/Konsole2.Requirements
--- kdebase-3.91.0/apps/konsole/developer-doc/old-documents/Konsole2.Requirements 2007-06-27 12:44:05.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konsole/developer-doc/old-documents/Konsole2.Requirements 2007-06-27 23:08:59.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.91.0/apps/konsole/user-doc/OLD-NEWS kdebase-3.91.0-kde4home/apps/konsole/user-doc/OLD-NEWS
--- kdebase-3.91.0/apps/konsole/user-doc/OLD-NEWS 2006-10-26 04:10:04.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konsole/user-doc/OLD-NEWS 2007-06-27 23:08:59.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.91.0/apps/konsole/user-doc/README.keyboard kdebase-3.91.0-kde4home/apps/konsole/user-doc/README.keyboard
--- kdebase-3.91.0/apps/konsole/user-doc/README.keyboard 2006-10-26 04:10:04.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/konsole/user-doc/README.keyboard 2007-06-27 23:08:59.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.91.0/apps/lib/konq/favicons/favicons.upd kdebase-3.91.0-kde4home/apps/lib/konq/favicons/favicons.upd
--- kdebase-3.91.0/apps/lib/konq/favicons/favicons.upd 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/lib/konq/favicons/favicons.upd 2007-06-27 23:08:59.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.91.0/apps/lib/konq/knewmenu.cpp kdebase-3.91.0-kde4home/apps/lib/konq/knewmenu.cpp
--- kdebase-3.91.0/apps/lib/konq/knewmenu.cpp 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.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.91.0/apps/lib/konq/SERVICEMENUS kdebase-3.91.0-kde4home/apps/lib/konq/SERVICEMENUS
--- kdebase-3.91.0/apps/lib/konq/SERVICEMENUS 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/lib/konq/SERVICEMENUS 2007-06-27 23:08:59.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.91.0/apps/lib/konq/tests/favicontest.cpp kdebase-3.91.0-kde4home/apps/lib/konq/tests/favicontest.cpp
--- kdebase-3.91.0/apps/lib/konq/tests/favicontest.cpp 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/lib/konq/tests/favicontest.cpp 2007-06-27 23:08:59.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.91.0/apps/lib/konq/tests/konqundomanagertest.cpp kdebase-3.91.0-kde4home/apps/lib/konq/tests/konqundomanagertest.cpp
--- kdebase-3.91.0/apps/lib/konq/tests/konqundomanagertest.cpp 2007-06-27 12:43:57.000000000 +0200
+++ kdebase-3.91.0-kde4home/apps/lib/konq/tests/konqundomanagertest.cpp 2007-06-27 23:08:59.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.91.0/apps/nsplugins/HOWTO.DEBUG kdebase-3.91.0-kde4home/apps/nsplugins/HOWTO.DEBUG
--- kdebase-3.91.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.91.0/workspace/kstartupconfig/kstartupconfig.cpp kdebase-3.91.0-kde4home/workspace/kstartupconfig/kstartupconfig.cpp
--- kdebase-3.91.0/workspace/kstartupconfig/kstartupconfig.cpp 2007-06-27 12:45:50.000000000 +0200
+++ kdebase-3.91.0-kde4home/workspace/kstartupconfig/kstartupconfig.cpp 2007-06-27 23:09:05.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.91.0/workspace/ktip/tips kdebase-3.91.0-kde4home/workspace/ktip/tips
--- kdebase-3.91.0/workspace/ktip/tips 2007-06-27 12:45:50.000000000 +0200
+++ kdebase-3.91.0-kde4home/workspace/ktip/tips 2007-06-27 23:09:06.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.91.0/workspace/kwin/CONFIGURING kdebase-3.91.0-kde4home/workspace/kwin/CONFIGURING
--- kdebase-3.91.0/workspace/kwin/CONFIGURING 2007-05-03 10:38:22.000000000 +0200
+++ kdebase-3.91.0-kde4home/workspace/kwin/CONFIGURING 2007-06-27 23:09:06.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.91.0/workspace/startkde kdebase-3.91.0-kde4home/workspace/startkde
--- kdebase-3.91.0/workspace/startkde 2007-06-27 16:03:01.000000000 +0200
+++ kdebase-3.91.0-kde4home/workspace/startkde 2007-06-27 23:09:06.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
@@ -369,15 +369,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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.57.2.1
diff -u -r1.57 -r1.57.2.1
--- .cvsignore 16 Jun 2007 19:11:13 -0000 1.57
+++ .cvsignore 24 Jul 2007 14:29:00 -0000 1.57.2.1
@@ -31,3 +31,4 @@
kde-redhat-config-3.5-fc5-0.6.tar.bz2
kde-redhat-config-3.5-fc7-1.tar.bz2
kdebase-3.5.7.tar.bz2
+kdebase-3.91.0.tar.bz2
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.263 -r 1.263.2.1 kdebase.spec
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.263
retrieving revision 1.263.2.1
diff -u -r1.263 -r1.263.2.1
--- kdebase.spec 21 Jul 2007 04:49:15 -0000 1.263
+++ kdebase.spec 24 Jul 2007 14:29:00 -0000 1.263.2.1
@@ -1,404 +1,142 @@
+Name: kdebase
-%define debug 0
-%define final 0
+%if "%{name}" != "kdebase4"
+Obsoletes: kdebase4 < %{version}-%{release}
+Provides: kdebase4 = %{version}-%{release}
+%else
+%define _prefix /opt/kde4
+%endif
-%define redhatify 1
-%define kde_settings 1
+Epoch: 6
-%define qt_version 3.3.8
-%define arts_version 1.5.7
-%define kde_version 3.5.7
-%define kdelibs_epoch 6
-%define arts_epoch 8
-%define make_cvs 1
-
-%define arts 1
-
-Summary: K Desktop Environment - core files
-Name: kdebase
-Epoch: 6
-Version: 3.5.7
-Release: 12%{?dist}
-
-License: GPL
-Url: http://www.kde.org
-Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-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.5-fc7-1.tar.bz2
-Source5: kde-np.pamd
-Source6: logrotate-kdm
-Source7: mailsettings.cc
-Source8: env.sh
-Source9: cr16-app-package_games_kids.png
-Source10: cr32-app-package_games_kids.png
-Source11: cr48-app-package_games_kids.png
-Source12: kderc
-
-Source50: kde-np-legacy.pamd
-Source1001: kde.pamd
-Source1002: kde-legacy.pamd
-
-Patch0: kdebase-3.5.5-redhat-pam.patch
-Patch1: kdebase-3.5.7-1-redhat-startkde.patch
-Patch2: kdebase-3.3.92-vroot.patch
-Patch3: kdebase-3.x-shortcuts.patch
-Patch4: kdebase-3.2.0-keymap.patch
-Patch5: kdebase-3.1-startpage.patch
-Patch6: kdebase-3.1.3-konsole-double-esc.patch
-Patch7: kdebase-3.3.92-kpersonalizer.patch
-Patch8: kdebase-3.2.92-logo.patch
-Patch10: kdebase-3.4.2-kdesktop-konsole.patch
-Patch11: kdebase-3.5.1-xdg.patch
-Patch13: kdebase-3.5.5-dbus.patch
-Patch14: kdebase-3.5.1-kdm-readme.patch
-Patch15: kdebase-3.5.1-konsole-fonts.patch
-Patch18: kdebase-3.5.2-kconf_update-klipper.patch
-Patch20: kdebase-3.5.5-keyinit.patch
-Patch21: kdebase-3.5.3-khelpcenter-sort.patch
-Patch22: kdebase-3.5.4-htdig.patch
-Patch24: kdebase-3.5.4-tango-icon-theme.patch
-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
-Patch29: kdebase-3.5.7-bz#244906.patch
-# Upstream alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch83974: kdebase-3.5.7-kde#83974.patch
-
-Provides: kdebase3 = %{version}-%{release}
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires(post): fileutils sh-utils
-Requires(postun): fileutils sh-utils
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-# See http://bugzilla.redhat.com/191306
-Requires(hint): htdig
-# man2html
-Requires(hint): man
-# /sbin/fuser
-Requires: psmisc
+Version: 3.91.0
+Release: 3%{?dist}%{?kde}
+Summary: K Desktop Environment 4 - Core Files
-%ifnarch s390 s390x
-Requires: eject
-%endif
+License: GPL
+Group: User Interface/Desktops
+URL: http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# upgrade path for former kde-redhat'ers
-Obsoletes: %{name}-kdm < %{epoch}:%{version}-%{release}
-Provides: %{name}-kdm = %{epoch}:%{version}-%{release}
-
-%if %{kde_settings}
-Requires: kde-settings
-# when/if -kdm is ever packaged separately
-Requires: kde-settings-kdm
-%else
-Requires: xorg-x11-xdm
-Requires: desktop-backgrounds-basic
-Requires: redhat-menus => 6.7.5
-Requires: redhat-artwork-kde >= 7.0.0-8
+Source1: kde.desktop
+# FIXME/TODO: consider using patched/hard-coded XDG_MENU_PREFIX
+# don't rely on env (same goes for kde3) -- Rex
+Source2: kde-env.sh
+
+%if "%{_prefix}" != "/usr"
+# macros sensitive to _prefix mods
+%define __cmake cmake
+%define _sysconfdir %{_prefix}/etc
%endif
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-BuildRequires: libxslt-devel libxml2-devel
-%if 0%{?fedora} > 6
+
+# use ~/.kde4 instead of ~/.kde
+Patch0: kdebase-%{version}-kde4home.diff
+
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(postun): /sbin/ldconfig xdg-utils
+
+BuildRequires: cmake >= 2.4.5
+BuildRequires: kdelibs-devel >= %{version}
+BuildRequires: kdepimlibs-devel >= %{version}
+
+Requires: kdelibs >= %{version}
+Requires: kdepimlibs >= %{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: pam-devel
-BuildRequires: gettext
-BuildRequires: perl
-BuildRequires: sed
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
-BuildRequires: pkgconfig
-BuildRequires: doxygen
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%ifarch %{ix86} x86_64 ia64 ppc ppc64
-%define _with_suspend 1
-Requires: pm-utils
-%endif
-%define _with_hal --with-hal
-# dbus >= 0.90, hal >= 0.5 (mock/yum is having problems groking this for me on el5/x86_64) -- Rex
-BuildRequires: dbus-devel hal-devel
-%endif
-BuildRequires: freetype-devel
-BuildRequires: openldap-devel
-BuildRequires: cyrus-sasl-devel
-BuildRequires: libart_lgpl-devel
-## X11 support details (xmkmf, bdftopcf)
-BuildRequires: xorg-x11-font-utils
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
[...2166 lines suppressed...]
-
-* Sun Jul 16 2000 Than Ngo <than at redhat.de>
-- use new snapshot
-- disable Motif
-
-* Tue Jul 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- use gcc 2.96
-- new snapshot
-
-* Sun Jul 2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Epoch 3
-- Update to current
-- Use egcs++
-
-* Fri Jun 30 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- Update (I put the fixes directly to CVS rather than collecting them
- in the spec)
-
-* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove man2html; we get that from man
-- new snapshot
-
-* Tue Jun 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- ExcludeArch ia64 for now
-- remove gnome .desktop file, we get it from gnome-core now.
-
-* Wed Apr 5 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove dependency on xpm (now in XFree86)
-
-* Sat Mar 18 2000 Bernhard Rosenkraenzer <bero at redhat.com>
-- new snapshot
-- move it to /usr, where it belongs
-
-* Sat Dec 25 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- Build the OpenGL screensavers, and move them to a separate package
-- Improve the spec file (BuildPrereqs etc.)
-
-* Thu Dec 16 1999 Bernhard Rosenkraenzer <bero at redhat.com>
-- remove patch #3 (obsoleted by kwin)
-
-* Sun Oct 24 1999 Bernhard Rosenkraenzer <bero at redhat.de>
-- 2.0 CVS snapshot
-- fix compilation
-
-* Thu Sep 23 1999 Preston Brown <pbrown at redhat.com>
-- clean up files in /tmp from startkde
-- mark doc files as such
-
-* Tue Sep 21 1999 Preston Brown <pbrown at redhat.com>
-- start autorun if present in startkde
-- check for configured soundcard before running sound services
-
-* Mon Sep 20 1999 Preston Brown <pbrown at redhat.com>
-- made kdelnks display Name property if they are of type Link
-
-* Thu Sep 16 1999 Preston Brown <pbrown at redhat.com>
-- moved png handling here (from kdelibs)
-- changed low color icon directory name to locolor
-
-* Tue Sep 14 1999 Preston Brown <pbrown at redhat.com>
-- added optional session management to logout dialog
-- include GNOME menus
-
-* Mon Sep 13 1999 Preston Brown <pbrown at redhat.com>
-- added link to /etc/X11/applnk, .directory file
-- included lowcolor icon sub-package
-- enable .desktop file access
-
-* Fri Sep 10 1999 Preston Brown <pbrown at redhat.com>
-- customized startkde script to set up user environment if not present.
-- mention kthememgr in description.
-
-* Wed Sep 08 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to 1.1.2 release
-- kvt is back
-- kde icon included
-- linux console fonts included
-
-* Thu Jul 15 1999 Preston Brown <pbrown at redhat.com>
-- PAM console logout problem solved.
-
-* Mon Jul 12 1999 Preston Brown <pbrown at redhat.com>
-- now includes screensaver password security fix
-
-* Fri Jun 11 1999 Preston Brown <pbrown at redhat.com>
-- snapshot, includes kde 1.1.1 + fixes
-- kvt removed for security reasons. It is a steaming pile of...
-
-* Mon Apr 19 1999 Preston Brown <pbrown at redhat.com>
-- last snapshot before release
-
-* Fri Apr 16 1999 Preston Brown <pbrown at redhat.com>
-- today's snapshot makes kfm a bit nicer and some other fixes
-- moved default rc files to kdesupport
-
-* Thu Apr 15 1999 Preston Brown <pbrown at redhat.com>
-- SUID bit removed from konsole_grantpty -- not needed w/glibc 2.1
-
-* Wed Apr 14 1999 Preston Brown <pbrown at redhat.com>
-- built with today's snapshot -- had to rebuild to fix pam problems.
-
-* Tue Apr 13 1999 Preston Brown <pbrown at redhat.com>
-- new snapshot fixes mimetype video/x-flic problem
-
-* Mon Apr 12 1999 Preston Brown <pbrown at redhat.com>
-- latest stable snapshot
-
-* Fri Apr 09 1999 Preston Brown <pbrown at redhat.com>
-- removed bell.xpm (used to be in fvwm2-icons, don't want installer to see
-- this previous connection and autoselect kdebase for upgrade).
-
-* Tue Mar 23 1999 Preston Brown <pbrown at redhat.com>
-- moved gdm patch
-
-* Mon Mar 22 1999 Preston Brown <pbrown at redhat.com>
-- added gdm session control file
-
-* Fri Mar 19 1999 Preston Brown <pbrown at redhat.com>
-- added pam-console stuff to kde pam file
-
-* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
-- Injected new description and group.
-
-* Mon Feb 07 1999 Preston Brown <pbrown at redhat.com>
-- upgraded to KDE 1.1 final.
+* Thu Jul 05 2007 Than Ngo <than at redhat.com> 3.91.0-4
+- rename to kdebase
-* Tue Jan 19 1999 Preston Brown <pbrown at redhat.com>
-- updated macros for RPM 3.0, removed red hat logo.
+* Thu Jun 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-3
+- fix %%_sysconfdir for %%_prefix != /usr case.
-* Tue Jan 05 1999 Preston Brown <pbrown at redhat.com>
-- re-merged from Duncan Haldane's stuff
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
+- updated kde4home.diff
+- CMAKE_BUILD_TYPE=RelWithDebInfo (we're already using %%optflags)
+
+* Wed Jun 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-1
+- kde-3.91.0
+- CMAKE_BUILD_TYPE=debug
+
+* Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.90.1-2
+- specfile cleanup (%%prefix issues mostly)
+
+* Sun May 13 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.90.1-1
+- update to 3.90.1
+- bump cmake BR to 2.4.5 as required upstream now
+- don't set execute bits by hand anymore, cmake has been fixed
+- use multilibs in /opt/kde4
+- add BR openssl-devel, NetworkManager-devel, bluez-libs-devel
+- add explicit BRs on strigi-devel, zlib-devel, bzip2-devel, libpng-devel
+ in case we want to drop the Rs on these from kdelibs4-devel
+- consistently add all BRs as -devel Rs, not just almost all, until we can
+ figure out which, if any, are really needed
+- BR libsmbclient-devel instead of samba on F>=7, EL>=6
+
+* Fri Mar 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-4
+- restore minimum version requirement for cmake
+- build against libxklavier on EL5
+- don't set QT4DIR and PATH anymore, qdbuscpp2xml has been fixed
+
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.80.3-3
+- +eXecute perms for %%{_prefix}/lib/*
+
+* Fri Feb 23 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-2
+- rebuild for patched FindKDE4Internal.cmake
+
+* Wed Feb 21 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.3-1
+- update to 3.80.3
+- update and improve parallel-installability patch
+- drop obsolete joydevice.h patch
+- remove translations of "KDE" without the "4" from kde4.desktop
+- resync BR and -devel Requires
+- don't set LD_LIBRARY_PATH
+- set QT4DIR and PATH so CMake's direct $QT4DIR/qdbuscpp2xml calls work
+- fix missing underscore in _datadir
+- install kde4.desktop in install, not prep
+- fix invalid syntax in kde4.desktop
+
+* Wed Nov 29 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.3.20061003svn
+- dropped -DCMAKE_SKIP_RPATH=TRUE from cmake
+- compiling with QA_RPATHS=0x0003; export QA_RPATHS
+
+* Sun Nov 26 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> 3.80.2-0.2.20061003svn
+- parallel build support
+- added -DCMAKE_SKIP_RPATH=TRUE to cmake to skip rpath
+- dropped qt4-devel >= 4.2.0, kdelibs4-devel as BR
+- spec file cleanups and added clean up in %%install
+- fixed PATH for libkdecore.so.5; cannot open shared object file;
+- added Logitech mouse support
+- added dbus-devel, hal-devel and more as BR
+- fixed broken joydevice.h - Kevin Kofler
+- added file kde4.desktop
+
+* Sun Oct 08 2006 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.80.2-0.1.20061003svn
+- first Fedora RPM (parts borrowed from the OpenSUSE kdebase 4 RPM and the Fedora kdebase 3 RPM)
+- apply parallel-installability patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.78
retrieving revision 1.78.2.1
diff -u -r1.78 -r1.78.2.1
--- sources 16 Jun 2007 19:11:13 -0000 1.78
+++ sources 24 Jul 2007 14:29:00 -0000 1.78.2.1
@@ -1,2 +1 @@
-d52f08756a8d3e9df478506bd258a4d8 kde-redhat-config-3.5-fc7-1.tar.bz2
-b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2
+396ec322d0e8a157a1278f19577ec44b kdebase-3.91.0.tar.bz2
--- KDE.session.gnome DELETED ---
--- env.sh DELETED ---
--- kde-legacy.pamd DELETED ---
--- kde-np-legacy.pamd DELETED ---
--- kde-np.pamd DELETED ---
--- kde.desktop DELETED ---
--- kde.pamd DELETED ---
--- kdebase-3.1-startpage.patch DELETED ---
--- kdebase-3.1.3-konsole-double-esc.patch DELETED ---
--- kdebase-3.2.0-keymap.patch DELETED ---
--- kdebase-3.2.92-logo.patch DELETED ---
--- kdebase-3.3.1-pam_krb5-bz#191049.patch DELETED ---
--- kdebase-3.3.92-kpersonalizer.patch DELETED ---
--- kdebase-3.3.92-vroot.patch DELETED ---
--- kdebase-3.4.2-kdesktop-konsole.patch DELETED ---
--- kdebase-3.5.1-kdm-readme.patch DELETED ---
--- kdebase-3.5.1-konsole-fonts.patch DELETED ---
--- kdebase-3.5.1-xdg.patch DELETED ---
--- kdebase-3.5.2-kconf_update-klipper.patch DELETED ---
--- kdebase-3.5.3-khelpcenter-sort.patch DELETED ---
--- kdebase-3.5.4-htdig.patch DELETED ---
--- kdebase-3.5.4-konqueror-shortcut.patch DELETED ---
--- kdebase-3.5.4-tango-icon-theme.patch DELETED ---
--- kdebase-3.5.5-dbus.patch DELETED ---
--- kdebase-3.5.5-keyinit.patch DELETED ---
--- kdebase-3.5.5-redhat-pam.patch DELETED ---
--- kdebase-3.5.5-suspend.patch DELETED ---
--- kdebase-3.5.6-consolekit-kdm.patch DELETED ---
--- kdebase-3.5.6-kdm-alternatebackground.patch DELETED ---
--- kdebase-3.5.7-1-redhat-startkde.patch DELETED ---
--- kdebase-3.5.7-bz#244906.patch DELETED ---
--- kdebase-3.5.7-kde#83974.patch DELETED ---
--- kdebase-3.x-shortcuts.patch DELETED ---
--- kderc DELETED ---
--- konsole.desktop DELETED ---
--- logrotate-kdm DELETED ---
--- mailsettings.cc DELETED ---
More information about the scm-commits
mailing list