From 0dc0c475b29fbc6eb0a9faa3d3598b737da37752f832af804d4c5c380634c2e3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 9 Jun 2010 14:46:43 +0000 Subject: [PATCH] Accepting request 41220 from X11:common:Factory Copy from X11:common:Factory/update-desktop-files based on submit request 41220 from user vuntz OBS-URL: https://build.opensuse.org/request/show/41220 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=65 --- map-desktop-category.sh | 2 +- update-desktop-files.changes | 6 ++++++ update-desktop-files.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/map-desktop-category.sh b/map-desktop-category.sh index 47a283e..124db27 100644 --- a/map-desktop-category.sh +++ b/map-desktop-category.sh @@ -121,7 +121,7 @@ function mapCategory() { ret="X-SuSE-$in" ;; #special tags: Application|Qt|KDE|GTK|GNOME|Motif|ConsoleOnly|Shell|X-Red-*| \ - X-Ximian-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \ + X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \ Office|Network|Game|Graphics|Education|Documentation|Development| \ Viewer|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;; Core-Edutainment|Core-Game|Core-Graphics|Core-Internet| \ diff --git a/update-desktop-files.changes b/update-desktop-files.changes index ce3436b..a6a9028 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 7 13:45:23 CEST 2010 - vuntz@opensuse.org + +- Accept X-GNOME-* categories in map-desktop-category.sh, so we + don't filter out those categories when updating a .desktop file. + ------------------------------------------------------------------- Thu Apr 8 15:21:18 CEST 2010 - mls@suse.de diff --git a/update-desktop-files.spec b/update-desktop-files.spec index 12df36d..dcdc7e4 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -20,7 +20,7 @@ Name: update-desktop-files Version: 11.1 -Release: 6 +Release: 7 Summary: A Build Tool to Update Desktop Files License: GPLv2+ Group: Development/Tools/Building