From f9db17ab551b72c0c90004ee1a177f48a5d83584e94175ff14812a17f55f6ac0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 15 Oct 2016 13:49:48 +0000 Subject: [PATCH] Accepting request 434620 from GNOME:Next - Use standardized patch tags as documented at https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines. OBS-URL: https://build.opensuse.org/request/show/434620 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=56 --- desktop-file-utils.changes | 6 ++++++ desktop-file-utils.spec | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 05f4390..27875db 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 19:28:12 UTC 2016 - dimstar@opensuse.org + +- Use standardized patch tags as documented at + https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines. + ------------------------------------------------------------------- Tue May 24 08:40:37 UTC 2016 - dimstar@opensuse.org diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 4abad9a..ece48c0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -28,11 +28,13 @@ Source1: suse-update-mime-defaults Source2: macros.desktop-file-utils # PATCH-FEATURE-OPENSUSE desktop-file-utils-suse-keys.patch vuntz@opensuse.org -- Handle SUSE-specific keys in validator. This is not strictly necessary, since they are prefixed with X-, but we can verify that the value has the right type. Patch0: desktop-file-utils-suse-keys.patch -# PATCH-UPSTREAM -- trailing semicolons are no longer required +# PATCH-FIX-UPSTREAM U_trailing-semicolons-are-optional_aec5711.patch fdo#76902 stefan.bruens@rwth-aachen.de -- trailing semicolons are no longer required Patch1: U_trailing-semicolons-are-optional_aec5711.patch -# PATCH-UPSTREAM -- add Cinnamon and EDE desktop environments +# PATCH-FEATURE-UPSTREAM U_add-Cinnamon-desktop-environment_50271fe.patch fdo#73497 stefan.bruens@rwth-aachen.de -- Register the Cinnamon desktop environment Patch2: U_add-Cinnamon-desktop-environment_50271fe.patch +# PATCH-FEATURE-UPSTREAM U_add-EDE-desktop-environment_97d6ba3.patch fdo#56353 stefan.bruens@rwth-aachen.de -- EDE as registered OnlyShowIn environment Patch3: U_add-EDE-desktop-environment_97d6ba3.patch +# PATCH-FIX-UPSTREAM desktop-file-utils-fdo94303-fix-buffer-over-read.patch fdo#94303 hpj@suse.com -- heap-based buffer overflow in validate.c while processing crafted file Patch4: desktop-file-utils-fdo94303-fix-buffer-over-read.patch BuildRequires: glib2-devel BuildRequires: pkg-config