Hello community, here is the log from the commit of package brp-check-suse for openSUSE:Factory checked in at 2014-11-04 17:27:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brp-check-suse (Old) and /work/SRC/openSUSE:Factory/.brp-check-suse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brp-check-suse" Changes: -------- --- /work/SRC/openSUSE:Factory/brp-check-suse/brp-check-suse.changes 2014-08-08 10:13:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.brp-check-suse.new/brp-check-suse.changes 2014-11-04 17:27:26.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Oct 20 14:35:36 UTC 2014 - [email protected] + +- Update to version 13.2+git20140829.9539e1d: + + xdg_menu: use File::Find instead of calling out to find + + brp-25-symlink: fix missing alternatives + + brp-25-symlink: fix eating /./ in path + + brp-25-symlink: massive rewrite to reduce number of calls + + brp-40-rootfs: reduce number of calls + + brp-60-hook: add some double quotes + + brp-50-check-python: add some double quotes, remove commented code + + Adwaita is a defined icon theme mandatory installed as dependency to GTK3. + +------------------------------------------------------------------- Old: ---- brp-check-suse-13.2+git20140727.d76b99d.tar.xz New: ---- _servicedata brp-check-suse-13.2+git20140829.9539e1d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brp-check-suse.spec ++++++ --- /var/tmp/diff_new_pack.3yDG0H/_old 2014-11-04 17:27:27.000000000 +0100 +++ /var/tmp/diff_new_pack.3yDG0H/_new 2014-11-04 17:27:27.000000000 +0100 @@ -23,7 +23,7 @@ Group: Development/Tools/Building # we need the full perl because of XML Parsing and utf-8 Requires: perl -Version: 13.2+git20140727.d76b99d +Version: 13.2+git20140829.9539e1d Release: 0 Url: https://github.com/openSUSE/brp-check-suse # ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3yDG0H/_old 2014-11-04 17:27:27.000000000 +0100 +++ /var/tmp/diff_new_pack.3yDG0H/_new 2014-11-04 17:27:27.000000000 +0100 @@ -4,6 +4,9 @@ <param name="versionformat">13.2+git%cd.%h</param> <param name="url">git://github.com/openSUSE/brp-check-suse.git</param> <param name="scm">git</param> + <param name="exclude">.git</param> + <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/brp-check-suse.git</param> <param name="changesrevision">9539e1dbb0</param></service> </servicedata>++++++ brp-check-suse-13.2+git20140727.d76b99d.tar.xz -> brp-check-suse-13.2+git20140829.9539e1d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/brp-check-suse-13.2+git20140727.d76b99d/brp-desktop.data/xdg_menu new/brp-check-suse-13.2+git20140829.9539e1d/brp-desktop.data/xdg_menu --- old/brp-check-suse-13.2+git20140727.d76b99d/brp-desktop.data/xdg_menu 2014-07-27 09:40:17.000000000 +0200 +++ new/brp-check-suse-13.2+git20140829.9539e1d/brp-desktop.data/xdg_menu 2014-10-20 16:35:35.000000000 +0200 @@ -11,6 +11,7 @@ use Encode; use I18N::Langinfo qw(langinfo CODESET); use POSIX qw(locale_h); +use File::Find; my $Version = "0.2"; @@ -1791,6 +1792,46 @@ return $output; } +sub find_icon ($@) +{ + my $icon = shift; + my @icon_dirs = (); + my @themes = ('pixmaps','icons/hicolor','icons/Adwaita'); + push @themes, @_; + my @sizes = ('16x16','22x22','24x24','32x32','36x36','48x48', + '64x64','72x72','96x96','128x128','192x192','scalable'); + my @types = ('actions','animations','apps','categories','devices', + 'emblems','emotes','filesystems','intl','mimetypes', + 'places','status','stock'); + + for my $d1 ('/usr','/opt/kde3', '/opt/gnome') { + for my $d2 (@themes) { + push @icon_dirs, "$d1/share/$d2"; + for my $d3 (@sizes) { + push @icon_dirs, map { "$d1/share/$d2/$d3/$_" } @types; + } + } + } + my $found = 0; + find(sub { $found = 1 if + $_ eq "$icon" || + $_ eq "$icon.png" || + $_ eq "$icon.jpg" || + $_ eq "$icon.xpm" || + $_ eq "$icon.svg" || + $_ eq "$icon.svgz"; }, + map { "$ENV{RPM_BUILD_ROOT}$_" } @icon_dirs); + find(sub { $found = 1 if + $_ eq "$icon" || + $_ eq "$icon.png" || + $_ eq "$icon.jpg" || + $_ eq "$icon.xpm" || + $_ eq "$icon.svg" || + $_ eq "$icon.svgz"; }, @icon_dirs) + unless $found; + return $found; +} + sub output_validate ($;$) { my ($menu, $indent) = @_; @@ -1824,16 +1865,12 @@ # standard name, accept it without any action } else { $output .= "WARNING: file extension in Icon line: $desktop->{file}\n" if substr($desktop->{Icon}, -4, 1) eq '.'; - my $xtrapath = ""; - if ($desktop->{'OnlyShowIn'} eq "KDE") { - $xtrapath .= ",icons/crystalsvg"; - } - if ($desktop->{'OnlyShowIn'} eq "GNOME") { - $xtrapath .= ",icons/gnome"; - } - my @out = `find \$RPM_BUILD_ROOT{/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor,icons/Adwaita$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null`; - @out = `find {/usr,/opt/kde3,/opt/gnome}/share/{pixmaps,icons/hicolor,icons/Adwaita$xtrapath}{,{16x16,22x22,24x24,32x32,36x36,48x48,64x64,72x72,96x96,128x128,192x192,scalable}/{actions,animations,apps,categories,devices,emblems,emotes,filesystems,intl,mimetypes,places,status,stock}} -name $desktop->{Icon} -o -name $desktop->{Icon}.png -o -name $desktop->{Icon}.jpg -o -name $desktop->{Icon}.xpm -o -name $desktop->{Icon}.svg -o -name $desktop->{Icon}.svgz 2> /dev/null` unless @out; - if ( !@out and $desktop->{'X-SuSE-YaST-Call'} eq '' ){ + my @xtrapath = (); + push @xtrapath, 'icons/crystalsvg' + if $desktop->{'OnlyShowIn'} eq "KDE"; + push @xtrapath, 'icons/gnome' + if $desktop->{'OnlyShowIn'} eq "GNOME"; + if (!find_icon($desktop->{Icon}, @xtrapath) and $desktop->{'X-SuSE-YaST-Call'} eq '') { $output .= "ERROR: Icon file not installed: $desktop->{file} ($desktop->{Icon})\n"; $validate_error = 1; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
