Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Nov 20 23:00:57 CET 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-11-20 17:12:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-20 22:17:53.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 20 22:16:43 CET 2006 - llunak@suse.cz
+
+- update the updater autostart utility (#219390)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.a9WflK/_old 2006-11-20 23:00:28.000000000 +0100
+++ /var/tmp/diff_new_pack.a9WflK/_new 2006-11-20 23:00:28.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 58
+Release: 59
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -379,7 +379,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 187
+Release: 188
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1515,6 +1515,8 @@
%endif
%changelog -n kdebase3
+* Mon Nov 20 2006 - llunak@suse.cz
+- update the updater autostart utility (#219390)
* Mon Nov 20 2006 - dmueller@suse.de
- improve application scoring (#221252)
- fix kickoff button flicker (#221287)
++++++ runupdater.patch ++++++
--- /var/tmp/diff_new_pack.a9WflK/_old 2006-11-20 23:00:32.000000000 +0100
+++ /var/tmp/diff_new_pack.a9WflK/_new 2006-11-20 23:00:32.000000000 +0100
@@ -1,5 +1,5 @@
--- runupdater/runupdater.desktop.sav 2006-11-16 14:48:43.000000000 +0100
-+++ runupdater/runupdater.desktop 2006-11-13 21:02:49.000000000 +0100
++++ runupdater/runupdater.desktop 2006-11-20 21:17:04.000000000 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
@@ -11,43 +11,106 @@
+X-KDE-StartupNotify=false
+OnlyShowIn=KDE;
--- runupdater/runupdater.cpp.sav 2006-11-16 14:48:44.000000000 +0100
-+++ runupdater/runupdater.cpp 2006-11-16 14:57:06.000000000 +0100
-@@ -0,0 +1,33 @@
++++ runupdater/runupdater.cpp 2006-11-20 21:50:09.000000000 +0100
+@@ -0,0 +1,96 @@
+/*
-+ Run either opensuseupdater or zen-updater but not both, prefer opensuseupdater.
++ Run either opensuseupdater or zen-updater but not both.
+ For opensuseupdater its autostart condition is checked, for zen-updater
+ it's checked whether its autostart file is enabled.
+*/
+
+#include
+#include
++#include
+#include
+
-+extern "C"
-+int kdemain()
++static bool disabledOSU()
+ {
-+ KInstance inst( "runupdater" );
+ KConfig osu( "opensuseupdaterrc", true );
+ osu.setGroup( "General" );
+// fprintf( stderr, "OSU:%d\n", osu.readBoolEntry ("Autostart", true ));
-+ if( osu.readBoolEntry( "Autostart", true ))
++ return !osu.readBoolEntry( "Autostart", true );
++ }
++
++static bool availableOSU()
++ {
++ return !KStandardDirs::findExe( "opensuseupdater" ).isEmpty();
++ }
++
++static bool runOSU()
++ {
++ return KApplication::kdeinitExec( "opensuseupdater", QStringList(), NULL, NULL, "0" ) == 0;
++ }
++
++static bool disabledZU()
++ {
++ KConfig zu( "zen-updater-auto.desktop", true, false, "xdgconf-autostart" );
++ zu.setGroup( "Desktop Entry" );
++// fprintf( stderr, "ZU %d\n", zu.readBoolEntry( "Hidden", false ) );
++ return zu.readBoolEntry( "Hidden", false );
++ }
++
++static bool availableZU()
++ {
++ return !KStandardDirs::findExe( "zen-updater" ).isEmpty();
++ }
++
++static bool runZU()
++ {
++ return KApplication::kdeinitExec( "zen-updater", QStringList(), NULL, NULL, "0" ) == 0;
++ }
++
++extern "C"
++int kdemain()
++ {
++ KInstance inst( "runupdater" );
++ // KSimpleConfig should parse this one just fine, with entries in the default group
++ KSimpleConfig sysconfig( "/etc/sysconfig/sw_management", true );
++ QString preferred = sysconfig.readEntry( "PREFERRED_SW_MANAGER_STACK" );
++// fprintf( stderr, "SC1: %s\n", preferred.latin1());
++ if( preferred.startsWith( "\"" ) && preferred.endsWith( "\"" )) // strip ""
++ preferred = preferred.mid( 1, preferred.length() - 2 );
++// fprintf( stderr, "SC2: %s\n", preferred.latin1());
++ if( preferred.lower() == "opensuse" )
+ {
-+ if( !KStandardDirs::findExe( "opensuseupdater" ).isEmpty()
-+ && KApplication::kdeinitExec( "opensuseupdater", QStringList(), NULL, NULL, "0" ) == 0 )
++ // opensuseupdater preferred - it's it's available, run it if it's enabled,
++ // try zen-updater only if opensuseupdater is not available at all
++ if( availableOSU())
+ {
-+// fprintf( stderr, "OSU OK\n" );
++ if( !disabledOSU())
++ return runOSU();
+ return 0;
+ }
++ else if( availableZU() && !disabledZU())
++ return runZU();
++ return 0;
++ }
++ else if( preferred.lower() == "zlm" )
++ {
++ // similar like above, just the other way around
++ if( availableZU())
++ {
++ if( !disabledZU())
++ return runZU();
++ return 0;
++ }
++ else if( availableOSU() && !disabledOSU())
++ return runOSU();
++ return 0;
++ }
++ else
++ {
++ // prefer opensuseupdater, but try to run zen-updater if opensuseupdater is not run
++ // the difference is that zen-updater is still run if opensuseupdater is disabled
++ if( availableOSU() && !disabledOSU() && runOSU())
++ return 0;
++ if( availableZU() && !disabledZU() && runZU())
++ return 0;
++ return 0;
+ }
-+ KConfig zu( "zen-updater-auto.desktop", true, false, "xdgconf-autostart" );
-+ zu.setGroup( "Desktop Entry" );
-+// fprintf( stderr, "ZU %d\n", zu.readBoolEntry( "Hidden", false ) );
-+ if( !zu.readBoolEntry( "Hidden", false ))
-+ KApplication::kdeinitExec( "zen-updater", QStringList(), NULL, NULL, "0" );
-+ return 0;
+ }
--- runupdater/Makefile.am.sav 2006-11-16 14:48:58.000000000 +0100
-+++ runupdater/Makefile.am 2006-11-16 14:52:04.000000000 +0100
++++ runupdater/Makefile.am 2006-11-20 21:17:04.000000000 +0100
@@ -0,0 +1,13 @@
+INCLUDES = $(all_includes)
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org