From 14fa6736d65ca1900f602f00153ef5c31abf4faf679fb9c8a52fe4dd2062d23a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 11 Mar 2012 19:06:28 +0000 Subject: [PATCH 1/2] Accepting request 108715 from home:dimstar:libgrss Accept the entire xdg icon name space... this fixes tracker-extras build for example. And ye: This fix HAS been submitted to github more than 2 weeks ago... still, we need it finally fixed in Factory OBS-URL: https://build.opensuse.org/request/show/108715 OBS-URL: https://build.opensuse.org/package/show/Base:System/brp-check-suse?expand=0&rev=32 --- brp-check-suse.changes | 6 + brp-check-suse.spec | 5 +- brp-check-xdg-menus.patch | 350 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 360 insertions(+), 1 deletion(-) create mode 100644 brp-check-xdg-menus.patch diff --git a/brp-check-suse.changes b/brp-check-suse.changes index adc8c89..8dc786a 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 9 21:56:04 UTC 2012 - dimstar@opensuse.org + +- Add brp-check-xdg-menus.patch: Acceot all icons specified in icon + naming spec. + ------------------------------------------------------------------- Fri Dec 9 14:18:30 UTC 2011 - coolo@suse.com diff --git a/brp-check-suse.spec b/brp-check-suse.spec index 1b5648f..1a49f58 100644 --- a/brp-check-suse.spec +++ b/brp-check-suse.spec @@ -1,7 +1,7 @@ # # spec file for package brp-check-suse # -# 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,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: brp-check-suse AutoReqProv: off Summary: Build root policy check scripts @@ -32,6 +33,7 @@ Url: http://gitorious.org/opensuse/brp-check-suse/ # make package # Source0: %{name}-%{version}.tar.bz2 +Patch0: brp-check-xdg-menus.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global provfind sh -c "grep -v 'brp-desktop.data' | %__find_provides" %global __find_provides %provfind @@ -43,6 +45,7 @@ build root checking or in parts implemeting SUSE policies. %prep %setup -q +%patch0 -p1 %ifnarch x86_64 s390x ppc64 rm brp-65-lib64-linux %endif diff --git a/brp-check-xdg-menus.patch b/brp-check-xdg-menus.patch new file mode 100644 index 0000000..baba404 --- /dev/null +++ b/brp-check-xdg-menus.patch @@ -0,0 +1,350 @@ +Index: brp-check-suse-1.0/brp-desktop.data/xdg_menu +=================================================================== +--- brp-check-suse-1.0.orig/brp-desktop.data/xdg_menu ++++ brp-check-suse-1.0/brp-desktop.data/xdg_menu +@@ -38,44 +38,310 @@ my %Desktop_entries; + my %Directory_entries; + + # These icons get accepted by default. Newer icon themes should provide them +-# in any case ++# in any case. List fetched from icon naming spec (last change from 2009), ++# without animation and international icons. + my %standardIconNames = ( ++# Standard Action Icons ++ "address-book-new" => undef, ++ "application-exit" => undef, ++ "appointment-new" => undef, ++ "call-start" => undef, ++ "call-stop" => undef, ++ "contact-new" => undef, ++ "document-new" => undef, ++ "document-open" => undef, ++ "document-open-recent" => undef, ++ "document-page-setup" => undef, ++ "document-print" => undef, ++ "document-print-preview" => undef, ++ "document-properties" => undef, ++ "document-revert" => undef, ++ "document-save" => undef, ++ "document-save-as" => undef, ++ "document-send" => undef, ++ "edit-clear" => undef, ++ "edit-copy" => undef, ++ "edit-cut" => undef, ++ "edit-delete" => undef, ++ "edit-find" => undef, ++ "edit-find-replace" => undef, ++ "edit-paste" => undef, ++ "edit-redo" => undef, ++ "edit-select-all" => undef, ++ "edit-undo" => undef, ++ "folder-new" => undef, ++ "format-indent-less" => undef, ++ "format-indent-more" => undef, ++ "format-justify-center" => undef, ++ "format-justify-fill" => undef, ++ "format-justify-left" => undef, ++ "format-justify-right" => undef, ++ "format-text-direction-ltr" => undef, ++ "format-text-direction-rtl" => undef, ++ "format-text-bold" => undef, ++ "format-text-italic" => undef, ++ "format-text-underline" => undef, ++ "format-text-strikethrough" => undef, ++ "go-bottom" => undef, ++ "go-down" => undef, ++ "go-first" => undef, ++ "go-home" => undef, ++ "go-jump" => undef, ++ "go-last" => undef, ++ "go-next" => undef, ++ "go-previous" => undef, ++ "go-top" => undef, ++ "go-up" => undef, ++ "help-about" => undef, ++ "help-contents" => undef, ++ "help-faq" => undef, ++ "insert-image" => undef, ++ "insert-link" => undef, ++ "insert-object" => undef, ++ "insert-text" => undef, ++ "list-add" => undef, ++ "list-remove" => undef, ++ "mail-forward" => undef, ++ "mail-mark-important" => undef, ++ "mail-mark-junk" => undef, ++ "mail-mark-notjunk" => undef, ++ "mail-mark-read" => undef, ++ "mail-mark-unread" => undef, ++ "mail-message-new" => undef, ++ "mail-reply-all" => undef, ++ "mail-reply-sender" => undef, ++ "mail-send" => undef, ++ "mail-send-receive" => undef, ++ "media-eject" => undef, ++ "media-playback-pause" => undef, ++ "media-playback-start" => undef, ++ "media-playback-stop" => undef, ++ "media-record" => undef, ++ "media-seek-backward" => undef, ++ "media-seek-forward" => undef, ++ "media-skip-backward" => undef, ++ "media-skip-forward" => undef, ++ "object-flip-horizontal" => undef, ++ "object-flip-vertical" => undef, ++ "object-rotate-left" => undef, ++ "object-rotate-right" => undef, ++ "process-stop" => undef, ++ "system-lock-screen" => undef, ++ "system-log-out" => undef, ++ "system-run" => undef, ++ "system-search" => undef, ++ "system-reboot" => undef, ++ "system-shutdown" => undef, ++ "tools-check-spelling" => undef, ++ "view-fullscreen" => undef, ++ "view-refresh" => undef, ++ "view-restore" => undef, ++ "view-sort-ascending" => undef, ++ "view-sort-descending" => undef, ++ "window-close" => undef, ++ "window-new" => undef, ++ "zoom-fit-best" => undef, ++ "zoom-in" => undef, ++ "zoom-original" => undef, ++ "zoom-out" => undef, ++ + # Standard Application Icons +- "accessories-calculator" => undef, "accessories-character-map" => undef, +- "accessories-dictionary" => undef, "accessories-text-editor" => undef, +- "help-browser" => undef, "multimedia-volume-control" => undef, +- "preferences-desktop-accessibility" => undef, +- "preferences-desktop-font" => undef, +- "preferences-desktop-keyboard" => undef, +- "preferences-desktop-locale" => undef, +- "preferences-desktop-multimedia" => undef, +- "preferences-desktop-screensaver" => undef, +- "preferences-desktop-theme" => undef, +- "preferences-desktop-wallpaper" => undef, +- "system-file-manager" => undef, +- "system-software-update" => undef, +- "utilities-system-monitor" => undef, +- "utilities-terminal" => undef, ++ "accessories-calculator" => undef, ++ "accessories-character-map" => undef, ++ "accessories-dictionary" => undef, ++ "accessories-text-editor" => undef, ++ "help-browser" => undef, ++ "multimedia-volume-control" => undef, ++ "preferences-desktop-accessibility" => undef, ++ "preferences-desktop-font" => undef, ++ "preferences-desktop-keyboard" => undef, ++ "preferences-desktop-locale" => undef, ++ "preferences-desktop-multimedia" => undef, ++ "preferences-desktop-screensaver" => undef, ++ "preferences-desktop-theme" => undef, ++ "preferences-desktop-wallpaper" => undef, ++ "system-file-manager" => undef, ++ "system-software-install" => undef, ++ "system-software-update" => undef, ++ "utilities-system-monitor" => undef, ++ "utilities-terminal" => undef, ++ + # Standard Category Icons +- "applications-accessories" => undef, +- "applications-development" => undef, +- "applications-engineering" => undef, +- "applications-games" => undef, +- "applications-graphics" => undef, +- "applications-internet" => undef, +- "applications-multimedia" => undef, +- "applications-office" => undef, +- "applications-other" => undef, +- "applications-science" => undef, +- "applications-system" => undef, +- "applications-utilities" => undef, +- "preferences-desktop" => undef, +- "preferences-desktop-peripherals" => undef, +- "preferences-desktop-personal" => undef, +- "preferences-other" => undef, +- "preferences-system" => undef, +- "preferences-system-network" => undef, +- "system-help" => undef, ++ "applications-accessories" => undef, ++ "applications-development" => undef, ++ "applications-engineering" => undef, ++ "applications-games" => undef, ++ "applications-graphics" => undef, ++ "applications-internet" => undef, ++ "applications-multimedia" => undef, ++ "applications-office" => undef, ++ "applications-other" => undef, ++ "applications-science" => undef, ++ "applications-system" => undef, ++ "applications-utilities" => undef, ++ "preferences-desktop" => undef, ++ "preferences-desktop-peripherals" => undef, ++ "preferences-desktop-personal" => undef, ++ "preferences-other" => undef, ++ "preferences-system" => undef, ++ "preferences-system-network" => undef, ++ "system-help" => undef, ++ ++# Standard Device Icons ++ "audio-card" => undef, ++ "audio-input-microphone" => undef, ++ "battery" => undef, ++ "camera-photo" => undef, ++ "camera-video" => undef, ++ "camera-web" => undef, ++ "computer" => undef, ++ "drive-harddisk" => undef, ++ "drive-optical" => undef, ++ "drive-removable-media" => undef, ++ "input-gaming" => undef, ++ "input-keyboard" => undef, ++ "input-mouse" => undef, ++ "input-tablet" => undef, ++ "media-flash" => undef, ++ "media-floppy" => undef, ++ "media-optical" => undef, ++ "media-tape" => undef, ++ "modem" => undef, ++ "multimedia-player" => undef, ++ "network-wired" => undef, ++ "network-wireless" => undef, ++ "pda" => undef, ++ "phone" => undef, ++ "printer" => undef, ++ "scanner" => undef, ++ "video-display" => undef, ++ ++# Standard Emblem Icons ++ "emblem-default" => undef, ++ "emblem-documents" => undef, ++ "emblem-downloads" => undef, ++ "emblem-favorite" => undef, ++ "emblem-important" => undef, ++ "emblem-mail" => undef, ++ "emblem-photos" => undef, ++ "emblem-readonly" => undef, ++ "emblem-shared" => undef, ++ "emblem-symbolic-link" => undef, ++ "emblem-synchronized" => undef, ++ "emblem-system" => undef, ++ "emblem-unreadable" => undef, ++ ++# Standard Emotion Icons ++ "face-angel" => undef, ++ "face-angry" => undef, ++ "face-cool" => undef, ++ "face-crying" => undef, ++ "face-devilish" => undef, ++ "face-embarrassed" => undef, ++ "face-kiss" => undef, ++ "face-laugh" => undef, ++ "face-monkey" => undef, ++ "face-plain" => undef, ++ "face-raspberry" => undef, ++ "face-sad" => undef, ++ "face-sick" => undef, ++ "face-smile" => undef, ++ "face-smile-big" => undef, ++ "face-smirk" => undef, ++ "face-surprise" => undef, ++ "face-tired" => undef, ++ "face-uncertain" => undef, ++ "face-wink" => undef, ++ "face-worried" => undef, ++ ++# Standard MIME Type Icons ++ "application-x-executable" => undef, ++ "audio-x-generic" => undef, ++ "font-x-generic" => undef, ++ "image-x-generic" => undef, ++ "package-x-generic" => undef, ++ "text-html" => undef, ++ "text-x-generic" => undef, ++ "text-x-generic-template" => undef, ++ "text-x-script" => undef, ++ "video-x-generic" => undef, ++ "x-office-address-book" => undef, ++ "x-office-calendar" => undef, ++ "x-office-document" => undef, ++ "x-office-presentation" => undef, ++ "x-office-spreadsheet" => undef, ++ ++# Standard Place Icons ++ "folder" => undef, ++ "folder-remote" => undef, ++ "network-server" => undef, ++ "network-workgroup" => undef, ++ "start-here" => undef, ++ "user-bookmarks" => undef, ++ "user-desktop" => undef, ++ "user-home" => undef, ++ "user-trash" => undef, ++ ++# Standard Status Icons ++ "appointment-missed" => undef, ++ "appointment-soon" => undef, ++ "audio-volume-high" => undef, ++ "audio-volume-low" => undef, ++ "audio-volume-medium" => undef, ++ "audio-volume-muted" => undef, ++ "battery-caution" => undef, ++ "battery-low" => undef, ++ "dialog-error" => undef, ++ "dialog-information" => undef, ++ "dialog-password" => undef, ++ "dialog-question" => undef, ++ "dialog-warning" => undef, ++ "folder-drag-accept" => undef, ++ "folder-open" => undef, ++ "folder-visiting" => undef, ++ "image-loading" => undef, ++ "image-missing" => undef, ++ "mail-attachment" => undef, ++ "mail-unread" => undef, ++ "mail-read" => undef, ++ "mail-replied" => undef, ++ "mail-signed" => undef, ++ "mail-signed-verified" => undef, ++ "media-playlist-repeat" => undef, ++ "media-playlist-shuffle" => undef, ++ "network-error" => undef, ++ "network-idle" => undef, ++ "network-offline" => undef, ++ "network-receive" => undef, ++ "network-transmit" => undef, ++ "network-transmit-receive" => undef, ++ "printer-error" => undef, ++ "printer-printing" => undef, ++ "security-high" => undef, ++ "security-medium" => undef, ++ "security-low" => undef, ++ "software-update-available" => undef, ++ "software-update-urgent" => undef, ++ "sync-error" => undef, ++ "sync-synchronizing" => undef, ++ "task-due" => undef, ++ "task-past-due" => undef, ++ "user-available" => undef, ++ "user-away" => undef, ++ "user-idle" => undef, ++ "user-offline" => undef, ++ "user-trash-full" => undef, ++ "weather-clear" => undef, ++ "weather-clear-night" => undef, ++ "weather-few-clouds" => undef, ++ "weather-few-clouds-night" => undef, ++ "weather-fog" => undef, ++ "weather-overcast" => undef, ++ "weather-severe-alert" => undef, ++ "weather-showers" => undef, ++ "weather-showers-scattered" => undef, ++ "weather-snow" => undef, ++ "weather-storm" => undef, + ); + sub check_file ($) + { From 321e6285284a9755f9f8fb5f03e535871e5141235fabae48387baf9f364f36bd Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 11 Mar 2012 19:06:49 +0000 Subject: [PATCH 2/2] - Add brp-check-xdg-menus.patch: Accept all icons specified in icon OBS-URL: https://build.opensuse.org/package/show/Base:System/brp-check-suse?expand=0&rev=33 --- brp-check-suse.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brp-check-suse.changes b/brp-check-suse.changes index 8dc786a..ddcd75a 100644 --- a/brp-check-suse.changes +++ b/brp-check-suse.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Mar 9 21:56:04 UTC 2012 - dimstar@opensuse.org -- Add brp-check-xdg-menus.patch: Acceot all icons specified in icon +- Add brp-check-xdg-menus.patch: Accept all icons specified in icon naming spec. -------------------------------------------------------------------