Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Thu May 28 02:55:00 CEST 2009. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-05-20 00:02:35.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2009-05-28 02:50:55.087403000 +0200 @@ -1,0 +2,13 @@ +Wed May 27 15:31:28 CEST 2009 - ro@suse.de + +- genkdmconf: skip warning message for oldkde != share/config + (we use share/kde4/config) +- genkdmconf: cleanup backup files if unchanged + +------------------------------------------------------------------- +Mon May 25 09:34:04 CEST 2009 - adrian@suse.de + +- Add ConsoleKit-x11 requires to kde4-kdm + (kdm fails to login user otherwise) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 New: ---- kdm-kdmconf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.J17902/_old 2009-05-28 02:51:03.000000000 +0200 +++ /var/tmp/diff_new_pack.J17902/_new 2009-05-28 02:51:03.000000000 +0200 @@ -30,7 +30,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.2.85 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,6 +67,13 @@ /usr/share/wallpapers %changelog +* Wed May 27 2009 ro@suse.de +- genkdmconf: skip warning message for oldkde != share/config + (we use share/kde4/config) +- genkdmconf: cleanup backup files if unchanged +* Mon May 25 2009 adrian@suse.de +- Add ConsoleKit-x11 requires to kde4-kdm + (kdm fails to login user otherwise) * Mon May 18 2009 coolo@novell.com - remove hotplug-kde3 patch, it was never included in > 4.0 packages * Fri May 15 2009 coolo@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.J17902/_old 2009-05-28 02:51:03.000000000 +0200 +++ /var/tmp/diff_new_pack.J17902/_new 2009-05-28 02:51:03.000000000 +0200 @@ -38,7 +38,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.2.85 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png Source3: kwin-cubecap.png @@ -57,6 +57,7 @@ Patch68: kdm-make_it_cool.diff Patch69: kdm-all-users-nopass.diff Patch70: kdm-generic-same-pam.diff +Patch71: kdm-kdmconf.diff #Subject: Dialog notifying about running low on disk space #From: Lubos Lunak #Feature: bnc#199054 @@ -135,6 +136,7 @@ %patch68 %patch69 %patch70 +%patch71 %patch74 %patch77 %patch82 @@ -446,6 +448,9 @@ %if %suse_version > 1110 Requires: kde4-kdm-branding = 11.2 %endif +%if %suse_version > 1030 +Requires: ConsoleKit-x11 +%endif Requires: kde4-kgreeter-plugins = %version Requires: pam-config %kde4_runtime_requires @@ -872,6 +877,13 @@ %_kde_share_dir/services/kded/susefreespacenotifier.desktop %changelog +* Wed May 27 2009 ro@suse.de +- genkdmconf: skip warning message for oldkde != share/config + (we use share/kde4/config) +- genkdmconf: cleanup backup files if unchanged +* Mon May 25 2009 adrian@suse.de +- Add ConsoleKit-x11 requires to kde4-kdm + (kdm fails to login user otherwise) * Mon May 18 2009 coolo@novell.com - remove hotplug-kde3 patch, it was never included in > 4.0 packages * Fri May 15 2009 coolo@suse.de ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.J17902/_old 2009-05-28 02:51:03.000000000 +0200 +++ /var/tmp/diff_new_pack.J17902/_new 2009-05-28 02:51:03.000000000 +0200 @@ -33,7 +33,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.2.85 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %( echo `rpm -q --queryformat '%{VERSION}' python-kde4`) @@ -72,6 +72,13 @@ %_kde_share_dir/services/plasma-*.desktop %changelog +* Wed May 27 2009 ro@suse.de +- genkdmconf: skip warning message for oldkde != share/config + (we use share/kde4/config) +- genkdmconf: cleanup backup files if unchanged +* Mon May 25 2009 adrian@suse.de +- Add ConsoleKit-x11 requires to kde4-kdm + (kdm fails to login user otherwise) * Mon May 18 2009 coolo@novell.com - remove hotplug-kde3 patch, it was never included in > 4.0 packages * Fri May 15 2009 coolo@suse.de ++++++ kdm-kdmconf.diff ++++++ --- kdm/kfrontend/genkdmconf.c +++ kdm/kfrontend/genkdmconf.c @@ -1019,6 +1019,26 @@ doLinkFile( ce->value ); } +static void +cleanupFile( const char *tname, int mode ) +{ + char *nname; + File file, file2; + char bn[PATH_MAX + 4]; + + ASPrintf( &nname, "%s/%s", newdir, tname ); + sprintf( bn, "%s.bak", nname ); + + if (readFile( &file, nname ) && readFile( &file2, bn )) { + if ((file.eof - file.buf == file2.eof - file2.buf) && !strncmp( file.buf, file2.buf, file.eof - file.buf )) { + unlink( nname ); + rename( bn, nname ); + chmod( nname, mode ); + } + } + free( nname ); +} + /* Create a new file in KDMCONF and fill it */ static void writeFile( const char *tname, int mode, const char *cont ) @@ -1027,6 +1047,8 @@ fputs( cont, f ); fclose( f ); addedFile( tname ); + if (!no_backup) + cleanupFile( tname + sizeof(KDMCONF), mode ); } @@ -3024,9 +3046,9 @@ memcmp( oldkde + olen - sizeof(SHR_CONF) + 1, SHR_CONF, sizeof(SHR_CONF) )) { - fprintf( stderr, - "Warning: --old-kde does not end with " SHR_CONF ". " - "Might wreak havoc.\n" ); +/* fprintf( stderr, + * "Warning: --old-kde (%s) does not end with " SHR_CONF ". " + * "Might wreak havoc.\n", oldkde ); */ oldkdepfx = oldkde; } else ASPrintf( (char **)&oldkdepfx, @@ -3138,6 +3160,8 @@ f = createFile( "kdmrc", kdmrcmode ); writeKdmrc( f ); fclose( f ); + if (!no_backup) + cleanupFile( "kdmrc", kdmrcmode ); f = createFile( "README", 0644 ); fprintf( f, @@ -3186,6 +3210,8 @@ "\nTry 'genkdmconf --help' if you want to generate another configuration.\n" "\nYou may delete this README.\n" ); fclose( f ); + if (!no_backup) + cleanupFile( "README", 0644 ); return 0; } ++++++ kdm-sysconfig-values.diff ++++++ ++++ 655 lines (skipped) ++++ between KDE/kdebase4-workspace/kdm-sysconfig-values.diff ++++ and kdebase4-workspace/kdm-sysconfig-values.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org