April 2012 - openSUSE Commits - openSUSE Mailing Lists

commit picard for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package picard for openSUSE:Factory checked in at 2012-04-02 10:30:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picard (Old) and /work/SRC/openSUSE:Factory/.picard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "picard", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/picard/picard.changes 2012-02-24 06:53:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.picard.new/picard.changes 2012-04-02 10:30:37.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Apr 1 16:52:18 CEST 2012 - ohering(a)suse.de + +- Update to version 0.16 - 2011-10-23 + - Added AcoustID support. + - Fixed track metadata plugins. + - Added new internal %_totalalbumtracks% tag field. (PICARD-16) + - Track metadata plugins now run also on non-album tracks. (PICARD-7) + - Fixed custom Various Artists name on the %albumartist% field. (PICARD-5) + - Album artist is now correctly "translated". (PICARD-1) + - Unicode punctuation is now converted to ASCII by default. + - WavPack correction files are moved together with the main files. (PICARD-15) + - Unicode filename normalization on OS X. + - Original release date is now saved into %originaldate%. + - Allow tagging with localized artist aliases (PICARD-17) + - Added a quit confirmation dialog. (PICARD-46) + - Standalone recordings can be tagged with relationships now. (PICARD-10) + - Refreshing an album will refresh its "other versions" listing. (PICARD-8) + - "Unicode punctuation to ASCII" now works on album-level metadata. (PICARD-50) + - DJ-mix tags should only be written to the medium where they apply. (PICARD-20) + - Support URL redirects in web service/network request module (PICARD-54) + - Jamendo and Archive.org cover art is displayed on web page, but not loaded by Picard plugin (PICARD-52) + - Edits to metadata in "Details..." menu not reflected in UI (PICARD-13) + - The status bar/new metadata box is updated when a selected file/track is changed. (PICARD-14) + +------------------------------------------------------------------- Old: ---- picard-0.15.1.tar.gz New: ---- picard-0.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picard.spec ++++++ --- /var/tmp/diff_new_pack.sup4Tt/_old 2012-04-02 10:30:39.000000000 +0200 +++ /var/tmp/diff_new_pack.sup4Tt/_new 2012-04-02 10:30:39.000000000 +0200 @@ -16,9 +16,8 @@ # - Name: picard -Version: 0.15.1 +Version: 0.16 Release: 0 Summary: The Next Generation MusicBrainz Tagger License: GPL-2.0+ ++++++ picard-0.15.1.tar.gz -> picard-0.16.tar.gz ++++++ ++++ 292690 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Bootloader for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-04-02 10:30:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2012-03-20 11:31:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-04-02 10:30:32.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Mar 22 10:30:34 UTC 2012 - mchang(a)suse.com + +- grub2-kernel-commandline.patch: add kerenl parameters (detected + necessary and user specfied one during installation) to grub2's + config file.(bnc#752939) +- 0.6.1 + +------------------------------------------------------------------- +Thu Mar 22 10:30:33 UTC 2012 - mchang(a)suse.com + +- grub2-efi-module.patch: add new grub2-efi module to support + booting on UEFI firmware. + +------------------------------------------------------------------- Old: ---- grub2-skip-fs-probe-for-extended-partition.patch perl-Bootloader-0.6.0.tar.bz2 New: ---- perl-Bootloader-0.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.v3r2wR/_old 2012-04-02 10:30:33.000000000 +0200 +++ /var/tmp/diff_new_pack.v3r2wR/_new 2012-04-02 10:30:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.6.0 +Version: 0.6.1 Release: 0 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -29,7 +29,6 @@ Source1: update-bootloader Source2: bootloader_entry Source3: boot.readme -Patch: grub2-skip-fs-probe-for-extended-partition.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl Conflicts: multipath-tools < 0.4.8-40.25.1 @@ -49,7 +48,6 @@ %prep %setup -q -%patch -p1 rm -rf perl-Bootloader-testsuite mkdir -p lib mv src lib/Bootloader ++++++ perl-Bootloader-0.6.0.tar.bz2 -> perl-Bootloader-0.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/perl-Bootloader.changes new/perl-Bootloader-0.6.1/perl-Bootloader.changes --- old/perl-Bootloader-0.6.0/perl-Bootloader.changes 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/perl-Bootloader.changes 2012-03-30 11:47:45.000000000 +0200 @@ -1,4 +1,38 @@ ------------------------------------------------------------------- +Thu Mar 22 10:30:34 UTC 2012 - mchang(a)suse.com + +- grub2-kernel-commandline.patch: add kerenl parameters (detected + necessary and user specfied one during installation) to grub2's + config file.(bnc#752939) +- 0.6.1 + +------------------------------------------------------------------- +Thu Mar 22 10:30:33 UTC 2012 - mchang(a)suse.com + +- grub2-efi-module.patch: add new grub2-efi module to support + booting on UEFI firmware. + +------------------------------------------------------------------- +Fri Mar 9 08:40:15 UTC 2012 - mchang(a)suse.com + +- grub2-skip-fs-probe-for-extended-partition.patch (bnc#750897) + +------------------------------------------------------------------- +Mon Mar 5 15:38:44 CET 2012 - snwint(a)suse.de + +- integrate grub2 patch + +------------------------------------------------------------------- +Wed Feb 15 09:16:19 UTC 2012 - mchang(a)suse.com + +- add-basic-grub2-module.patch : add basic grub2 support + +------------------------------------------------------------------- +Wed Dec 14 11:06:44 UTC 2011 - coolo(a)suse.com + +- fix license to be in spdx.org format + +------------------------------------------------------------------- Fri Oct 14 09:31:40 CEST 2011 - snwint(a)suse.de - support more devices in fallback heuristics diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/perl-Bootloader.spec.in new/perl-Bootloader-0.6.1/perl-Bootloader.spec.in --- old/perl-Bootloader-0.6.0/perl-Bootloader.spec.in 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/perl-Bootloader.spec.in 2012-03-30 11:47:45.000000000 +0200 @@ -18,7 +18,7 @@ Recommends: perl-gettext AutoReqProv: on Group: System/Boot -License: GNU General Public License (GPL) +License: GPL-2.0+ Summary: Library for Configuring Boot Loaders Source: perl-Bootloader-%{version}.tar.bz2 Source1: update-bootloader diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Core/GRUB2.pm new/perl-Bootloader-0.6.1/src/Core/GRUB2.pm --- old/perl-Bootloader-0.6.0/src/Core/GRUB2.pm 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/src/Core/GRUB2.pm 2012-03-30 11:47:45.000000000 +0200 @@ -28,6 +28,10 @@ C<< $settings_ref = Bootloader::Core::GRUB2->GetSettings (); >> +C<< $glob_info = Bootloader::Core::GRUB2->Global2Info (\@glob_lines, \@section_names); >> + +C<< $lines_ref = Bootloader::Core::GRUB2->Info2Global (\%section_info, \@section_names); >> + C<< $status = Bootloader::Core::GRUB2->SetSettings (\%settings); >> C<< $status = Bootloader::Core::GRUB2->InitializeBootloader (); >> @@ -312,7 +316,8 @@ my $self = shift; return [ Bootloader::Path::Grub2_devicemap(), - Bootloader::Path::Grub2_installdevice() ]; + Bootloader::Path::Grub2_installdevice(), + Bootloader::Path::Grub2_defaultconf() ]; } =item @@ -359,8 +364,25 @@ $self->l_milestone ("GRUB2::Parselines: device_map: $unix <-> $fw."); } - my %glob; - my $glob_ref = \%glob; + # and now proceed with /etc/default/grub + my @defaultconf = @{$files{Bootloader::Path::Grub2_defaultconf()} || []}; + $self->l_milestone ("GRUB2::Parselines: input from default conf :\n'" . + join("'\n' ", @defaultconf) . "'"); + + # prefix commented config with '@' instread of '#' + # this is to new notation for "commented config" and + # need to process saparately + foreach my $conf (@defaultconf) { + if ($conf =~ m/^\s*#\s*GRUB_/) { + $conf =~ s/^\s*#/@/; + } + } + + (my $glob_ref, my $sect_ref) = $self->ParseMenuFileLines ( + "=", + [], + \@defaultconf + ); if (not exists $self->{"mountpoints"}{'/'}) { @@ -561,10 +583,32 @@ # map<string,list<string>> CreateLines () sub CreateLines { my $self = shift; + my $global = $self->{"global"}; # first create /etc/default/grub_installdevice my $grub2_installdev = $self->CreateGrubInstalldevLines(); + if (defined $global->{"__lines"}) { + foreach my $line (@{$global->{"__lines"}}) { + if (defined $line->{"value"} && $line->{"value"} eq "" ) { + $line->{"value"} = '""'; + } + } + } + + my $grub2_defaultconf = $self->PrepareMenuFileLines ( + [], + $global, + "", + "=" + ); + + + foreach my $conf (@{$grub2_defaultconf}) { + if ($conf =~ m/^\s*@\s*GRUB_/) { + $conf =~ s/^\s*@/#/; + } + } # TODO: as we know the grub2-install also create device map # I skipped creating them by yast .. @@ -578,11 +622,193 @@ ## } return { Bootloader::Path::Grub2_installdevice() => $grub2_installdev, + Bootloader::Path::Grub2_defaultconf() => $grub2_defaultconf, ## Bootloader::Path::Grub2_devicemap() => \@device_map, } } =item +C<< $glob_info = $Bootloader::Core::GRUB2->Global2Info (\@glob_lines, \@section_names); >> + +Gets the general information from the global section of the menu file. This information +usually means the default section, graphical menu, timeout etc. As argument it takes +a reference to the list of hashes representing lines of the section, returns a reference +to a hash containing the important information. + +=cut + +# map<string,string> Global2Info (list<map<string,any>> global, list<string>sections) + +sub Global2Info { + my $self = shift; + my @lines = @{+shift}; + my @sections = @{+shift}; + + my %ret = (); + $ret{"__lines"} = \@lines; + + foreach my $line_ref (@lines) { + my $key = $line_ref->{"key"}; + my $val = $line_ref->{"value"}; + + # Check if key is defined to prevent perl warnings + next if (!defined($key)); + + if ($key =~ m/@?GRUB_CMDLINE_LINUX_DEFAULT/) + { + if ($val =~ /^(?:(.*)\s+)?vga=(\S+)(?:\s+(.*))?$/) + { + $ret{"vgamode"} = $2 if $2 ne ""; + $val = $self->MergeIfDefined ($1, $3); + } + + $ret{"append"} = $val; + } + } + + return \%ret; +} + +=item +C<< $lines_ref = Bootloader::Core::GRUB2->Info2Global (\%section_info, \@section_names); >> + +Takes the info about the global options and uses it to construct the list of lines. +The info about global option also contains the original lines. +As parameter, takes the section info (reference to a hash) and a list of sectino names, +returns the lines (a list of hashes). + +=cut + +# list<map<string,any>> Info2Global (map<string,string> info, list<string>sections) + +sub Info2Global { + my $self = shift; + my %globinfo = %{+shift}; + my $sections_ref = shift; + + my @lines = @{$globinfo{"__lines"} || []}; + + # my $sysconf = Bootloader::Tools::GetSysconfigValue("DEFAULT_APPEND"); + # allow to keep the section unchanged + return \@lines unless $globinfo{"__modified"} || 0; + + if (scalar (@lines) == 0) + { + @lines = ( + { + 'key' => 'GRUB_DISTRIBUTOR', + 'value' => '"openSUSE"', + 'comment_before' => [ + '# If you change this file, run \'grub2-mkconfig -o /boot/grub2/grub.cfg\' afterwards to update', + '# /boot/grub2/grub.cfg.' + ], + }, + { + 'key' => 'GRUB_DEFAULT', + 'value' => '0', + }, + { + 'key' => 'GRUB_HIDDEN_TIMEOUT', + 'value' => '0', + }, + { + 'key' => 'GRUB_HIDDEN_TIMEOUT_QUIET', + 'value' => 'true', + }, + { + 'key' => 'GRUB_TIMEOUT', + 'value' => '10', + }, + { + 'key' => 'GRUB_CMDLINE_LINUX_DEFAULT', + 'value' => 'quiet splash=silent', + }, + { + 'key' => 'GRUB_CMDLINE_LINUX', + 'value' => '""', + }, + { + 'key' => '@GRUB_BADRAM', + 'value' => '"0x01234567,0xfefefefe,0x89abcdef,0xefefefef"', + 'comment_before' => [ + '# Uncomment to enable BadRAM filtering, modify to suit your needs', + '# This works with Linux (no patch required) and with any kernel that obtains', + '# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)' + ], + }, + { + 'key' => '@GRUB_TERMINAL', + 'value' => 'console', + 'comment_before' => [ + '# Uncomment to disable graphical terminal (grub-pc only)' + ], + }, + { + 'key' => '@GRUB_GFXMODE', + 'value' => '640x480', + 'comment_before' => [ + '# The resolution used on graphical terminal', + '# note that you can use only modes which your graphic card supports via VBE', + '# you can see them in real GRUB with the command `vbeinfo\'' + ], + }, + { + 'key' => '@GRUB_DISABLE_LINUX_UUID', + 'value' => 'true', + 'comment_before' => [ + '# Uncomment if you don\'t want GRUB to pass "root=UUID=xxx" parameter to Linux' + ], + }, + { + 'key' => '@GRUB_DISABLE_LINUX_RECOVERY', + 'value' => 'true', + 'comment_before' => [ + '# Uncomment to disable generation of recovery mode menu entries' + ], + }, + { + 'key' => '@GRUB_INIT_TUNE', + 'value' => '480 440 1', + 'comment_before' => [ + '# Uncomment to get a beep at grub start' + ], + }, + ); + + } + + # We don't need to set root= as grub2-mkconfig + # already detect that for us .. + # my $root = delete $globinfo{"root"} || ""; + my $vga = delete $globinfo{"vgamode"} || ""; + my $append = delete $globinfo{"append"} || ""; + # $root = " root=$root" if $root ne ""; + $vga = " vga=$vga" if $vga ne ""; + $append = " $append" if $append ne ""; + + @lines = map { + my $line_ref = $_; + my $key = $line_ref->{"key"}; + if ($key =~ m/@?GRUB_CMDLINE_LINUX_DEFAULT/) + { + $line_ref->{"value"} = "$append$vga" if "$append$vga" ne ""; + $append = ""; + $vga = ""; + } + defined $line_ref ? $line_ref : (); + } @lines; + + if ("$append$vga" ne "") { + push @lines, { + "key" => "GRUB_CMDLINE_LINUX_DEFAULT", + "value" => "$append$vga", + } + } + + return \@lines; +} + +=item C<< $settings_ref = Bootloader::Core::GRUB2->GetSettings (); >> returns the complete settings in a hash. Does not read the settings @@ -655,6 +881,7 @@ # boolean InitializeBootloader () sub InitializeBootloader { my $self = shift; + my %glob = %{$self->{"global"}}; my $file = Bootloader::Path::Grub2_installdevice(); my $files_ref = $self->ReadFiles ([$file,]); @@ -663,6 +890,13 @@ return undef; } + my $install_opts = "--force"; + my $skip_fs_probe = delete $glob{"boot_extended"}; + + if (defined $skip_fs_probe and $skip_fs_probe eq "true") { + $install_opts .= " --skip-fs-probe "; + } + my @devices = @{$files_ref->{$file} || []}; # Hmm .. grub2-install must has been run before @@ -679,7 +913,7 @@ # the tradeoff is we can't capture errors # only patch grub2 package is possible way # to get around this problem - "/usr/sbin/grub2-install --force $dev", + "/usr/sbin/grub2-install $install_opts $dev", "/var/log/YaST2/y2log_bootloader" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.6.1/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.6.0/src/Core/GRUB2EFI.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/perl-Bootloader-0.6.1/src/Core/GRUB2EFI.pm 2012-03-30 11:47:45.000000000 +0200 @@ -0,0 +1,456 @@ +#! /usr/bin/perl -w +# +# Bootloader configuration base library +# + +=head1 NAME + +Bootlader::Core::GRUB2EFI - library for blank configuration + + +=head1 PREFACE + +This package is the GRUB2EFI library of the bootloader configuration + +=head1 SYNOPSIS + +use Bootloader::Core::GRUB2EFI; + +C<< $obj_ref = Bootloader::Core::GRUB2EFI->new (); >> + +C<< $files_ref = Bootloader::Core::GRUB2EFI->ListFiles (); >> + +C<< $status = Bootloader::Core::GRUB2EFI->ParseLines (\%files, $avoid_reading_device_map); >> + +C<< $files_ref = Bootloader::Core::GRUB2EFI->CreateLines (); >> + +C<< $settings_ref = Bootloader::Core::GRUB2EFI->GetSettings (); >> + +C<< $status = Bootloader::Core::GRUB2EFI->SetSettings (\%settings); >> + +C<< $glob_info = Bootloader::Core::GRUB2EFI->Global2Info (\@glob_lines, \@section_names); >> + +C<< $lines_ref = Bootloader::Core::GRUB2EFI->Info2Global (\%section_info, \@section_names); >> + +C<< $status = Bootloader::Core::GRUB2EFI->UpdateBootloader (); >> + +C<< $status = Bootloader::Core::GRUB2EFI->InitializeBootloader (); >> + + +=head1 DESCRIPTION + +=over 2 + +=cut + +package Bootloader::Core::GRUB2EFI; + +use strict; + +use Bootloader::Core; +our @ISA = ('Bootloader::Core'); +use Bootloader::Path; + +use Data::Dumper; + +#module interface + +=item +C<< $obj_ref = Bootloader::Core::GRUB2EFI->new (); >> + +Creates an instance of the Bootloader::Core::GRUB2EFI class. + +=cut + +sub new { + my $self = shift; + my $old = shift; + + my $loader = $self->SUPER::new ($old); + bless ($loader); + + $loader->l_milestone ("GRUB2EFI::new: Created GRUB2EFI instance"); + return $loader; +} + + + +=item +C<< $files_ref = Bootloader::Core::GRUB2EFI->ListFiles (); >> + +Returns the list of the configuration files of the bootloader +Returns undef on fail + +=cut + +# list<string> ListFiles () +sub ListFiles { + my $self = shift; + + return [ Bootloader::Path::Grub2_defaultconf() ]; +} + + +=item +C<< $status = Bootloader::Core::GRUB2EFI->ParseLines (\%files, $avoid_reading_device_map); >> + +Parses the contents of all files and stores the settings in the +internal structures. As first argument, it takes a hash reference, where +keys are file names and values are references to lists, each +member is one line of the file. As second argument, it takes a +boolean flag that, if set to a true value, causes it to skip +updating the internal device_map information. Returns undef on +fail, defined nonzero value on success. + +=cut + +# void ParseLines (map<string,list<string>>, boolean) +sub ParseLines { + my $self = shift; + my %files = %{+shift}; + my $avoid_reading_device_map = shift; + + # and now proceed with /etc/default/grub + my @defaultconf = @{$files{Bootloader::Path::Grub2_defaultconf()} || []}; + $self->l_milestone ("GRUB2::Parselines: input from default conf :\n'" . + join("'\n' ", @defaultconf) . "'"); + + # prefix commented config with '@' instread of '#' + # this is to new notation for "commented config" and + # need to process saparately + foreach my $conf (@defaultconf) { + if ($conf =~ m/^\s*#\s*GRUB_/) { + $conf =~ s/^\s*#/@/; + } + } + + (my $glob_ref, my $sect_ref) = $self->ParseMenuFileLines ( + "=", + [], + \@defaultconf + ); + + $self->{"global"} = $glob_ref; + return 1; +} + +=item +C<< $files_ref = Bootloader::Core::GRUB2EFI->CreateLines (); >> + +creates contents of all files from the internal structures. +Returns a hash reference in the same format as argument of +ParseLines on success, or undef on fail. + +=cut + +# map<string,list<string>> CreateLines () +sub CreateLines { + my $self = shift; + my $global = $self->{"global"}; + + if (defined $global->{"__lines"}) { + foreach my $line (@{$global->{"__lines"}}) { + if (defined $line->{"value"} && $line->{"value"} eq "" ) { + $line->{"value"} = '""'; + } + } + } + + my $grub2_defaultconf = $self->PrepareMenuFileLines ( + [], + $global, + "", + "=" + ); + + foreach my $conf (@{$grub2_defaultconf}) { + if ($conf =~ m/^\s*@\s*GRUB_/) { + $conf =~ s/^\s*@/#/; + } + } + + return { Bootloader::Path::Grub2_defaultconf() => $grub2_defaultconf }; +} + +=item +C<< $glob_info = $Bootloader::Core::GRUB2EFI->Global2Info (\@glob_lines, \@section_names); >> + +Gets the general information from the global section of the menu file. This information +usually means the default section, graphical menu, timeout etc. As argument it takes +a reference to the list of hashes representing lines of the section, returns a reference +to a hash containing the important information. + +=cut + +# map<string,string> Global2Info (list<map<string,any>> global, list<string>sections) + +sub Global2Info { + my $self = shift; + my @lines = @{+shift}; + my @sections = @{+shift}; + + my %ret = (); + $ret{"__lines"} = \@lines; + + foreach my $line_ref (@lines) { + my $key = $line_ref->{"key"}; + my $val = $line_ref->{"value"}; + + # Check if key is defined to prevent perl warnings + next if (!defined($key)); + + if ($key =~ m/@?GRUB_CMDLINE_LINUX_DEFAULT/) + { + if ($val =~ /^(?:(.*)\s+)?vga=(\S+)(?:\s+(.*))?$/) + { + $ret{"vgamode"} = $2 if $2 ne ""; + $val = $self->MergeIfDefined ($1, $3); + } + + $ret{"append"} = $val; + } + } + + return \%ret; +} + +=item +C<< $lines_ref = Bootloader::Core::GRUB2EFI->Info2Global (\%section_info, \@section_names); >> + +Takes the info about the global options and uses it to construct the list of lines. +The info about global option also contains the original lines. +As parameter, takes the section info (reference to a hash) and a list of sectino names, +returns the lines (a list of hashes). + +=cut + +# list<map<string,any>> Info2Global (map<string,string> info, list<string>sections) + +sub Info2Global { + my $self = shift; + my %globinfo = %{+shift}; + my $sections_ref = shift; + + my @lines = @{$globinfo{"__lines"} || []}; + + # my $sysconf = Bootloader::Tools::GetSysconfigValue("DEFAULT_APPEND"); + # allow to keep the section unchanged + return \@lines unless $globinfo{"__modified"} || 0; + + if (scalar (@lines) == 0) + { + @lines = ( + { + 'key' => 'GRUB_DISTRIBUTOR', + 'value' => '"openSUSE"', + 'comment_before' => [ + '# If you change this file, run \'grub2-mkconfig -o /boot/grub2/grub.cfg\' afterwards to update', + '# /boot/grub2/grub.cfg.' + ], + }, + { + 'key' => 'GRUB_DEFAULT', + 'value' => '0', + }, + { + 'key' => 'GRUB_HIDDEN_TIMEOUT', + 'value' => '0', + }, + { + 'key' => 'GRUB_HIDDEN_TIMEOUT_QUIET', + 'value' => 'true', + }, + { + 'key' => 'GRUB_TIMEOUT', + 'value' => '10', + }, + { + 'key' => 'GRUB_CMDLINE_LINUX_DEFAULT', + 'value' => 'quiet splash=silent', + }, + { + 'key' => 'GRUB_CMDLINE_LINUX', + 'value' => '""', + }, + { + 'key' => '@GRUB_BADRAM', + 'value' => '"0x01234567,0xfefefefe,0x89abcdef,0xefefefef"', + 'comment_before' => [ + '# Uncomment to enable BadRAM filtering, modify to suit your needs', + '# This works with Linux (no patch required) and with any kernel that obtains', + '# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)' + ], + }, + { + 'key' => '@GRUB_TERMINAL', + 'value' => 'console', + 'comment_before' => [ + '# Uncomment to disable graphical terminal (grub-pc only)' + ], + }, + { + 'key' => '@GRUB_GFXMODE', + 'value' => '640x480', + 'comment_before' => [ + '# The resolution used on graphical terminal', + '# note that you can use only modes which your graphic card supports via VBE', + '# you can see them in real GRUB with the command `vbeinfo\'' + ], + }, + { + 'key' => '@GRUB_DISABLE_LINUX_UUID', + 'value' => 'true', + 'comment_before' => [ + '# Uncomment if you don\'t want GRUB to pass "root=UUID=xxx" parameter to Linux' + ], + }, + { + 'key' => '@GRUB_DISABLE_LINUX_RECOVERY', + 'value' => 'true', + 'comment_before' => [ + '# Uncomment to disable generation of recovery mode menu entries' + ], + }, + { + 'key' => '@GRUB_INIT_TUNE', + 'value' => '480 440 1', + 'comment_before' => [ + '# Uncomment to get a beep at grub start' + ], + }, + ); + + } + + # We don't need to set root= as grub2-mkconfig + # already detect that for us .. + # my $root = delete $globinfo{"root"} || ""; + my $vga = delete $globinfo{"vgamode"} || ""; + my $append = delete $globinfo{"append"} || ""; + # $root = " root=$root" if $root ne ""; + $vga = " vga=$vga" if $vga ne ""; + $append = " $append" if $append ne ""; + + @lines = map { + my $line_ref = $_; + my $key = $line_ref->{"key"}; + if ($key =~ m/@?GRUB_CMDLINE_LINUX_DEFAULT/) + { + $line_ref->{"value"} = "$append$vga" if "$append$vga" ne ""; + $append = ""; + $vga = ""; + } + defined $line_ref ? $line_ref : (); + } @lines; + + if ("$append$vga" ne "") { + push @lines, { + "key" => "GRUB_CMDLINE_LINUX_DEFAULT", + "value" => "$append$vga", + } + } + + return \@lines; +} + +=item +C<< $settings_ref = Bootloader::Core::GRUB2EFI->GetSettings (); >> + +returns the complete settings in a hash. Does not read the settings +from the system, but returns internal structures. + +=cut + +# map<string,any> GetSettings () +sub GetSettings { + my $self = shift; + my $ret = $self->SUPER::GetSettings (); + return $ret; +} + +=item +C<< $status = Bootloader::Core::GRUB2EFI->SetSettings (\%settings); >> + +Stores the settings in the given parameter to the internal +structures. Does not touch the system. +Returns undef on fail, defined nonzero value on success. + +=cut + +# void SetSettings (map<string,any> settings) +sub SetSettings { + my $self = shift; + my %settings = %{+shift}; + return $self->SUPER::SetSettings (\%settings); +} + + +=item +C<< $status = Bootloader::Core::GRUB2EFI->UpdateBootloader (); >> + +Updates the settings in the system. Backs original configuration files +up and replaces them with the ones with the '.new' suffix. Also performs +operations needed to make the change effect (run '/sbin/elilo'). +Returns undef on fail, defined nonzero value on success. + +=cut + +# boolean UpdateBootloader () +sub UpdateBootloader { + my $self = shift; + my $avoid_init = shift; + + # backup the config file + # it really did nothing for now + my $ret = $self->SUPER::UpdateBootloader (); + + return undef unless defined $ret; + + if (! $avoid_init) + { + return $self->InitializeBootloader (); + } + + return 0 == $self->RunCommand ( + "/usr/sbin/grub2-efi-mkconfig -o /boot/grub2-efi/grub.cfg", + "/var/log/YaST2/y2log_bootloader" + ); +} + + +=item +C<< $status = Bootloader::Core::GRUB2EFI->InitializeBootloader (); >> + +Initializes the firmware to boot the bootloader. +Returns undef on fail, defined nonzero value otherwise + +=cut + +# boolean InitializeBootloader () +sub InitializeBootloader { + my $self = shift; + + my $ret = $self->RunCommand ( + "/usr/sbin/grub2-efi-install", + "/var/log/YaST2/y2log_bootloader" + ); + + return 0 if (0 != $ret); + + return 0 == $self->RunCommand ( + "/usr/sbin/grub2-efi-mkconfig -o /boot/grub2-efi/grub.cfg", + "/var/log/YaST2/y2log_bootloader" + ); +} + +1; + +# +# Local variables: +# mode: perl +# mode: font-lock +# mode: auto-fill +# fill-column: 78 +# End: +# + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Library.pm new/perl-Bootloader-0.6.1/src/Library.pm --- old/perl-Bootloader-0.6.0/src/Library.pm 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/src/Library.pm 2012-03-30 11:47:45.000000000 +0200 @@ -137,6 +137,11 @@ require Bootloader::Core::GRUB2; $loader = Bootloader::Core::GRUB2->new ($loader); } + elsif ($bootloader eq "grub2-efi") + { + require Bootloader::Core::GRUB2EFI; + $loader = Bootloader::Core::GRUB2EFI->new ($loader); + } elsif ($bootloader eq "lilo") { require Bootloader::Core::LILO; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Path.pm new/perl-Bootloader-0.6.1/src/Path.pm --- old/perl-Bootloader-0.6.0/src/Path.pm 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/src/Path.pm 2012-03-30 11:47:45.000000000 +0200 @@ -270,4 +270,16 @@ return Prefix($value); } +=item +C<< $path = Bootloader::Path::Grub2_defaultconf(); >> + +Gets path for grub configuration file grub +(this file contains commands for initialize bootloader). + +=cut + +sub Grub2_defaultconf { + my $value = "/etc/default/grub"; + return Prefix($value); +} 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/src/Tools.pm new/perl-Bootloader-0.6.1/src/Tools.pm --- old/perl-Bootloader-0.6.0/src/Tools.pm 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/src/Tools.pm 2012-03-30 11:47:45.000000000 +0200 @@ -882,7 +882,9 @@ sub UpdateBootloader { - my $ret = $lib_ref->UpdateBootloader (); + my $avoid_init = shift; + + my $ret = $lib_ref->UpdateBootloader ($avoid_init); DumpLog ($lib_ref->{"loader"}); return $ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/update-bootloader new/perl-Bootloader-0.6.1/update-bootloader --- old/perl-Bootloader-0.6.0/update-bootloader 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/update-bootloader 2012-03-30 11:47:45.000000000 +0200 @@ -122,7 +122,7 @@ if ( -f '/usr/bin/zypper' ){ my $zypper_out = qx{zypper --terse tos -l}; if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){ - return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2")); + return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2" || $loader eq "grub2-efi")); return $2 if ($2 ne ""); } } @@ -131,7 +131,7 @@ # Second try: Is there a usable /etc/SuSE-release? # This should really not be used anymore, as the syntax changed # no 'SP1' in the output. - if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2")) { + if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2" || $loader eq "grub2-efi")) { # first line is sufficient $namever = <RELEASE>; @@ -506,7 +506,10 @@ } if (defined $oper{refresh}) { - my $ret = UpdateBootloader(); + my $loader = Bootloader::Tools::GetBootloader(); + my $avoid_init = ($loader eq "grub2" || $loader eq "grub2-efi") ? 1 : 0; + + my $ret = UpdateBootloader($avoid_init); exit 1 if ( !$ret ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.6.0/version new/perl-Bootloader-0.6.1/version --- old/perl-Bootloader-0.6.0/version 2012-03-05 15:23:55.000000000 +0100 +++ new/perl-Bootloader-0.6.1/version 2012-03-30 11:47:45.000000000 +0200 @@ -1 +1 @@ -0.6.0 +0.6.1 ++++++ update-bootloader ++++++ --- /var/tmp/diff_new_pack.v3r2wR/_old 2012-04-02 10:30:34.000000000 +0200 +++ /var/tmp/diff_new_pack.v3r2wR/_new 2012-04-02 10:30:34.000000000 +0200 @@ -122,7 +122,7 @@ if ( -f '/usr/bin/zypper' ){ my $zypper_out = qx{zypper --terse tos -l}; if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){ - return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2")); + return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2" || $loader eq "grub2-efi")); return $2 if ($2 ne ""); } } @@ -131,7 +131,7 @@ # Second try: Is there a usable /etc/SuSE-release? # This should really not be used anymore, as the syntax changed # no 'SP1' in the output. - if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2")) { + if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2" || $loader eq "grub2-efi")) { # first line is sufficient $namever = <RELEASE>; @@ -506,7 +506,10 @@ } if (defined $oper{refresh}) { - my $ret = UpdateBootloader(); + my $loader = Bootloader::Tools::GetBootloader(); + my $avoid_init = ($loader eq "grub2" || $loader eq "grub2-efi") ? 1 : 0; + + my $ret = UpdateBootloader($avoid_init); exit 1 if ( !$ret ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Any-Moose for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package perl-Any-Moose for openSUSE:Factory checked in at 2012-04-02 10:30:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Any-Moose (Old) and /work/SRC/openSUSE:Factory/.perl-Any-Moose.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Any-Moose", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Any-Moose/perl-Any-Moose.changes 2011-12-07 14:38:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Any-Moose.new/perl-Any-Moose.changes 2012-04-02 10:30:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 28 19:41:54 UTC 2012 - joop.boonen(a)opensuse.org + +- Solved bnc#752049 + Added missing Requires: perl(Moose) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Any-Moose.spec ++++++ --- /var/tmp/diff_new_pack.GARRjT/_old 2012-04-02 10:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.GARRjT/_new 2012-04-02 10:30:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Any-Moose # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: perl-Any-Moose Version: 0.18 Release: 0 -License: Artistic-1.0 or GPL-1.0+ %define cpan_name Any-Moose Summary: use Moose or Mouse modules -Url: http://search.cpan.org/dist/Any-Moose/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Any-Moose/ Source: http://www.cpan.org/authors/id/S/SA/SARTAK/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl(Moose) BuildRequires: perl-macros -Requires: perl(Mouse) +BuildRequires: perl(Moose) +Requires: perl(Moose) %{perl_requires} %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-translations for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package package-translations for openSUSE:Factory checked in at 2012-04-02 10:30:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/package-translations (Old) and /work/SRC/openSUSE:Factory/.package-translations.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "package-translations", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/package-translations/package-translations.changes 2012-03-26 11:04:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.package-translations.new/package-translations.changes 2012-04-02 10:30:16.000000000 +0200 @@ -2 +2 @@ -Sat Mar 24 16:13:31 CET 2012 - <coolo(a)suse.com> +Fri Mar 30 16:13:31 CEST 2012 - <coolo(a)suse.com> @@ -4 +4 @@ -- automated update on 2012-03-24 +- automated update on 2012-03-30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-translations.tar.bz2 ++++++ Files old/mo/package-translations-ru.mo and new/mo/package-translations-ru.mo differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt-glib for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package libvirt-glib for openSUSE:Factory checked in at 2012-04-02 10:30:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt-glib (Old) and /work/SRC/openSUSE:Factory/.libvirt-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt-glib", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt-glib/libvirt-glib.changes 2012-03-08 19:44:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt-glib.new/libvirt-glib.changes 2012-04-02 10:30:12.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Apr 1 09:03:38 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 0.0.7: + + Fix typo in filesystem access mode constant. + + Remove incorrect encoding of XML attributes. + + Add support for USB redirection devices. + + Add support for SPICE agent device. + + Fix typo in channel device target constant. + + Make all string getters return a const string. + + Keep list of devices sorted in original XML order. + +------------------------------------------------------------------- Old: ---- libvirt-glib-0.0.6.tar.gz New: ---- libvirt-glib-0.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-glib.spec ++++++ --- /var/tmp/diff_new_pack.Enhae7/_old 2012-04-02 10:30:15.000000000 +0200 +++ /var/tmp/diff_new_pack.Enhae7/_new 2012-04-02 10:30:15.000000000 +0200 @@ -17,9 +17,8 @@ # - Name: libvirt-glib -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: GLib and GObject mapping of libvirt License: LGPL-2.1+ ++++++ libvirt-glib-0.0.6.tar.gz -> libvirt-glib-0.0.7.tar.gz ++++++ ++++ 6699 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libjreen for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package libjreen for openSUSE:Factory checked in at 2012-04-02 10:30:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjreen (Old) and /work/SRC/openSUSE:Factory/.libjreen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libjreen", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libjreen/libjreen.changes 2012-03-16 13:16:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libjreen.new/libjreen.changes 2012-04-02 10:30:11.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 1 14:18:41 UTC 2012 - dev(a)dominik-schmidt.de + +- Update to version 1.0.5 + * Fixed parsing of message's thread attribute + +- Changes in 1.0.4 + * Added support for in-band registration + * Added ability to force/deny compression/encryption + * Added CAPTCHA support + * Fixed IQ requests to yourself + * Fixed handling of messages' types in MessageSession + +------------------------------------------------------------------- Old: ---- libjreen-1.0.3.tar.bz2 New: ---- libjreen-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjreen.spec ++++++ --- /var/tmp/diff_new_pack.c3RSlU/_old 2012-04-02 10:30:12.000000000 +0200 +++ /var/tmp/diff_new_pack.c3RSlU/_new 2012-04-02 10:30:12.000000000 +0200 @@ -19,7 +19,7 @@ %define soname 1 Name: libjreen -Version: 1.0.3 +Version: 1.0.5 Release: 0 Summary: Qt Jabber/XMPP library License: GPL-2.0+ ++++++ libjreen-1.0.3.tar.bz2 -> libjreen-1.0.5.tar.bz2 ++++++ ++++ 4363 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-04-02 10:29:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2012-03-29 11:40:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-04-02 10:30:06.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 30 15:38:38 UTC 2012 - anixx(a)opensuse.org + +- recommend udisks so to ensure that udisks-1 is installed, + for automount script +- watch also /run/mount/utab for future udisks-2 compatibility + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.EuxjHl/_old 2012-04-02 10:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.EuxjHl/_new 2012-04-02 10:30:10.000000000 +0200 @@ -316,6 +316,8 @@ Recommends: kdebase3-ksysguardd == %{version} %if 0%{?with_hal} > 0 Recommends: kdebase3-with-hal-enabled +%else +Recommends: udisks %endif %description workspace ++++++ mtab-reenable.patch ++++++ --- /var/tmp/diff_new_pack.EuxjHl/_old 2012-04-02 10:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.EuxjHl/_new 2012-04-02 10:30:10.000000000 +0200 @@ -1,6 +1,6 @@ diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/fstabbackend.cpp kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp --- kdebase-3.5.10.orig/kioslave/media/mediamanager/fstabbackend.cpp 2006-10-01 21:31:54.000000000 +0400 -+++ kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp 2011-08-17 14:51:34.697199962 +0400 ++++ kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp 2012-03-30 09:31:42.911936175 +0400 @@ -50,7 +50,7 @@ #define MTAB "/etc/mnttab" #else @@ -10,36 +10,47 @@ #endif -@@ -58,7 +58,7 @@ +@@ -58,8 +58,9 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly) : QObject(), BackendBase(list), m_networkSharesOnly(networkSharesOnly) { - KDirWatch::self()->addFile(MTAB); + KDirWatch::self()->addDir("/media",0); KDirWatch::self()->addFile(FSTAB); ++ KDirWatch::self()->addDir("/run/mount/utab",0); connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ), -@@ -94,7 +94,7 @@ + this, SLOT( slotDirty(const QString&) ) ); +@@ -94,7 +95,8 @@ m_mediaList.removeMedium(*it, false); } KDirWatch::self()->removeFile(FSTAB); - KDirWatch::self()->removeFile(MTAB); + KDirWatch::self()->removeDir("/media"); ++ KDirWatch::self()->removeDir("/run/mount/utab"); } QString FstabBackend::mount( const QString &_udi ) -@@ -119,8 +119,9 @@ +@@ -119,13 +121,14 @@ void FstabBackend::slotDirty(const QString &path) { - if (path==MTAB) -+ if (path=="/media") ++ if (path==FSTAB) { +- handleMtabChange(); ++ handleFstabChange(); + } +- else if (path==FSTAB) ++ else + { +- handleFstabChange(); + sleep(1); - handleMtabChange(); ++ handleMtabChange(); } - else if (path==FSTAB) -@@ -136,18 +137,23 @@ + } + +@@ -136,18 +139,23 @@ || mount->mountType() == "sysfs" || mount->mountType() == "fdescfs" || mount->mountType() == "kernfs" @@ -65,7 +76,7 @@ // We might want to display only network shares // since HAL doesn't handle them -@@ -187,10 +193,12 @@ +@@ -187,10 +195,12 @@ nothing has changed, do not stat the mount point. Avoids hang if network shares are stalling */ QString mtabEntry = dev + "*" + mp + "*" + fs; @@ -78,7 +89,7 @@ QString id = generateId(dev, mp); new_mtabIds+=id; -@@ -203,7 +211,6 @@ +@@ -203,7 +213,6 @@ m_mediaList.changeMediumState(id, true, false, mime, icon, label); } @@ -86,7 +97,7 @@ else if ( !m_mtabIds.contains(id) ) { QString name = generateName(dev, fs); -@@ -219,9 +226,8 @@ +@@ -219,9 +228,8 @@ m->setIconName(icon); m->setLabel(label); @@ -97,7 +108,7 @@ } QStringList::iterator it2 = m_mtabIds.begin(); -@@ -247,12 +253,10 @@ +@@ -247,12 +255,10 @@ m_mediaList.changeMediumState(*it2, false, false, mime, icon, label); } @@ -112,7 +123,7 @@ m_mtabIds = new_mtabIds; diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/removablebackend.cpp kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp --- kdebase-3.5.10.orig/kioslave/media/mediamanager/removablebackend.cpp 2006-03-17 13:17:33.000000000 +0300 -+++ kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp 2011-08-17 14:51:51.854357476 +0400 ++++ kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp 2012-03-30 08:41:04.856935421 +0400 @@ -27,7 +27,7 @@ #ifdef _OS_SOLARIS_ #define MTAB "/etc/mnttab" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde3-i18n for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package kde3-i18n for openSUSE:Factory checked in at 2012-04-02 10:29:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde3-i18n (Old) and /work/SRC/openSUSE:Factory/.kde3-i18n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde3-i18n", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kde3-i18n/kde3-i18n.changes 2011-12-08 11:28:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde3-i18n.new/kde3-i18n.changes 2012-04-02 10:29:54.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 30 04:18:00 UTC 2012 - anixx(a)opensuse.org + +- adapt to kdelibs3 change that moves manpages to /opt + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde3-i18n.spec ++++++ --- /var/tmp/diff_new_pack.jmoepl/_old 2012-04-02 10:30:05.000000000 +0200 +++ /var/tmp/diff_new_pack.jmoepl/_new 2012-04-02 10:30:06.000000000 +0200 @@ -16,6 +16,7 @@ # # icecream 0 +%define _mandir /opt/kde3/share/man BuildRequires: kdelibs3-devel BuildRequires: recode @@ -1670,7 +1671,7 @@ gzip $i done -mv %{buildroot}%{_mandir} %{buildroot}/opt/kde3/share/man +#mv %{buildroot}%{_mandir} %{buildroot}/opt/kde3/share/man # # remove unwanted files -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit javacc3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package javacc3 for openSUSE:Factory checked in at 2012-04-02 10:29:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javacc3 (Old) and /work/SRC/openSUSE:Factory/.javacc3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javacc3", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/javacc3/javacc3.changes 2011-09-23 02:04:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.javacc3.new/javacc3.changes 2012-04-02 10:29:48.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 26 12:55:53 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-BSD-3-Clause-with-non-nuclear-addition + Use this SPDX-like license until upstream accept it + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javacc3.spec ++++++ --- /var/tmp/diff_new_pack.Bh3z9j/_old 2012-04-02 10:29:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Bh3z9j/_new 2012-04-02 10:29:50.000000000 +0200 @@ -31,7 +31,7 @@ Version: 3.2 Release: 2 Summary: A parser/scanner generator for java -License: Other uncritical OpenSource License +License: SUSE-BSD-3-Clause-with-non-nuclear-addition Source0: javacc-3.2-src.tar.bz2 Source1: javacc Source2: jjdoc @@ -58,7 +58,7 @@ %if %{with_repolib} %package repolib -License: Other uncritical OpenSource License +License: SUSE-BSD-3-Clause-with-non-nuclear-addition Summary: A parser/scanner generator for java Group: Development/Libraries/Java @@ -76,7 +76,7 @@ %endif %package manual -License: Other uncritical OpenSource License +License: SUSE-BSD-3-Clause-with-non-nuclear-addition Summary: A parser/scanner generator for java Group: Development/Libraries/Java @@ -92,7 +92,7 @@ %package demo -License: Other uncritical OpenSource License +License: SUSE-BSD-3-Clause-with-non-nuclear-addition Summary: A parser/scanner generator for java Group: Development/Libraries/Java -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gvfs for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '12

02 Apr '12

Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2012-04-02 10:29:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2012-03-29 13:59:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2012-04-02 10:29:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 30 09:06:34 UTC 2012 - vuntz(a)opensuse.org + +- Add udisks2 Recommends to backends subpackage when udisks2 + support is enabled: we need udisks2 for the volume monitor to + work. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.JDZnME/_old 2012-04-02 10:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.JDZnME/_new 2012-04-02 10:29:43.000000000 +0200 @@ -93,6 +93,9 @@ Requires: %{name} = %{version} Recommends: gvfs-backend-afc Recommends: obex-data-server +%if %{with_udisks2} +Recommends: udisks2 +%endif %glib2_gsettings_schema_requires %description backends -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0