Hello community,
here is the log from the commit of package brp-extract-appdata for
openSUSE:Factory checked in at 2012-02-17 12:00:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/brp-extract-appdata (Old)
and /work/SRC/openSUSE:Factory/.brp-extract-appdata.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "brp-extract-appdata", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/brp-extract-appdata/brp-extract-appdata.changes
2012-02-16 20:47:18.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.brp-extract-appdata.new/brp-extract-appdata.changes
2012-02-17 12:00:06.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Feb 17 08:32:07 UTC 2012 - co...@suse.com
+
+- do not output nodisplay=true .desktop files
+- avoid empty <applications/>
+
+-------------------------------------------------------------------
+Fri Feb 17 08:25:36 UTC 2012 - co...@suse.com
+
+- remove /usr/share/applications/ prefix
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ create-appdata-xml.pl ++++++
--- /var/tmp/diff_new_pack.Rmr2cT/_old 2012-02-17 12:00:07.000000000 +0100
+++ /var/tmp/diff_new_pack.Rmr2cT/_new 2012-02-17 12:00:07.000000000 +0100
@@ -66,6 +66,9 @@
$apphash{$currentfile}->{$key} = $val;
}
+# we don't need to keep this around - beside for debugging
+unlink $appdata;
+
for my $rpm (@rpms) {
next if ($rpm =~ m/-debuginfo/ || $rpm =~ m/-debugsource/);
open (FILES, "chroot $build_root rpm -qp --qf '[%{NAME} %{FILENAMES}\n]'
$rpm|");
@@ -94,8 +97,13 @@
print APPDATA "<?xml version='1.0'?>\n";
print APPDATA "<applications version='0.1'>\n";
+my $applications_output = 0;
+
while (my ($file, $hash) = each(%apphash)) {
+ next if (($hash->{nodisplay} || '') =~ m,true,i);
+ $applications_output++;
print APPDATA " <application>\n";
+ $file =~ s,/usr/share/applications/,,;
print APPDATA " <id type='application'>" . _e($file) . "</id>\n";
print APPDATA " <pkgname>" . _e($hash->{pkgname}) . "</pkgname>\n";
if ($hash->{name}) {
@@ -135,12 +143,18 @@
print APPDATA "</applications>\n";
close(APPDATA);
+if ($applications_output == 0) {
+ print "DEBUG: removing empty XML\n";
+ # all were nodisplay
+ unlink($output);
+ exit(0);
+}
+
# just for debug
open(APPDATA, "<", $output);
while ( <APPDATA> ) {
print "XML: $_";
}
close(APPDATA);
-# we don't need to keep this around - beside for debugging
-unlink $appdata;
exit 0;
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
