Hello community, here is the log from the commit of package suseRegister checked in at Tue May 13 16:08:13 CEST 2008. -------- --- suseRegister/suseRegister.changes 2008-05-07 17:51:40.000000000 +0200 +++ /mounts/work_src_done/NOARCH/suseRegister/suseRegister.changes 2008-05-13 12:50:18.248921000 +0200 @@ -1,0 +2,6 @@ +Tue May 13 12:48:57 CEST 2008 - mc@suse.de + +- adapt virtual command 'desktops' to new pattern naming and + kde4 availability + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.M27780/_old 2008-05-13 16:07:27.000000000 +0200 +++ /var/tmp/diff_new_pack.M27780/_new 2008-05-13 16:07:27.000000000 +0200 @@ -13,7 +13,7 @@ Name: suseRegister Version: 1.2 -Release: 116 +Release: 119 Summary: Registration Tool Group: Productivity/Other License: GPL v2 or later @@ -92,6 +92,9 @@ %endif %changelog +* Tue May 13 2008 mc@suse.de +- adapt virtual command 'desktops' to new pattern naming and + kde4 availability * Wed May 07 2008 mc@suse.de - call query-pool with --registrable - remove temporary fix of (bnc#385868) ++++++ suseRegister-1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.2/SRPrivate.pm new/suseRegister-1.2/SRPrivate.pm --- old/suseRegister-1.2/SRPrivate.pm 2008-05-07 17:41:28.000000000 +0200 +++ new/suseRegister-1.2/SRPrivate.pm 2008-05-13 12:48:19.000000000 +0200 @@ -384,9 +384,10 @@ if(!$ctx->{nohwdata}) { - my $kde = 0; + my $kde3 = 0; + my $kde4 = 0; my $gnome = 0; - my $x11 = 0; + my $x11 = 0; if($#{$ctx->{installedPatterns}} == -1) { @@ -396,11 +397,15 @@ foreach my $pat (@{$ctx->{installedPatterns}}) { - if($pat eq "kde") + if($pat eq "kde3_basis") { - $kde = 1; + $kde3 = 1; } - elsif($pat eq "gnome") + elsif($pat eq "kde4_basis") + { + $kde4 = 1; + } + elsif($pat eq "gnome_basis") { $gnome = 1; } @@ -409,12 +414,19 @@ $x11 = 1; } } - - $out = "KDE" if($kde && !$gnome); - $out = "GNOME" if(!$kde && $gnome); - $out = "KDE+GNOME" if($kde && $gnome); - $out = "X11" if($x11 && !$kde && !$gnome); - $out = "NOX11" if(!$x11 && !$kde && !$gnome); + + $out = "KDE3" if( $kde3 && !$kde4 && !$gnome ); + $out = "KDE4" if(!$kde3 && $kde4 && !$gnome ); + $out = "GNOME" if(!$kde3 && !$kde4 && $gnome ); + + $out = "KDE3+GNOME" if( $kde3 && !$kde4 && $gnome ); + $out = "KDE3+KDE4" if( $kde3 && $kde4 && !$gnome ); + $out = "KDE4+GNOME" if(!$kde3 && $kde4 && $gnome ); + + $out = "KDE3+KDE4+GNOME" if( $kde3 && $kde4 && $gnome ); + + $out = "X11" if( $x11 && !$kde3 && !$kde4 && !$gnome); + $out = "NOX11" if(!$x11 && !$kde3 && !$kde4 && !$gnome); } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org