From 3963df132dc68c3ccb8d56e01ddf30d8ebc641e11b06bb29a39ca37e1ca6f8b3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 16 Dec 2009 08:39:36 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=7 --- desktop-file-utils-LXDE-key.patch | 12 ------------ desktop-file-utils.changes | 5 ----- desktop-file-utils.spec | 8 +++----- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 desktop-file-utils-LXDE-key.patch diff --git a/desktop-file-utils-LXDE-key.patch b/desktop-file-utils-LXDE-key.patch deleted file mode 100644 index 00b447c..0000000 --- a/desktop-file-utils-LXDE-key.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr old-desktop-file-utils-0.15//src/validate.c desktop-file-utils-0.15/src/validate.c ---- old-desktop-file-utils-0.15//src/validate.c 2008-02-05 13:06:11.000000000 +0100 -+++ desktop-file-utils-0.15/src/validate.c 2009-12-13 18:00:29.480228379 +0100 -@@ -324,7 +324,7 @@ - }; - - static const char *show_in_registered[] = { -- "KDE", "GNOME", "ROX", "XFCE", "Old" -+ "KDE", "GNOME", "LXDE", "ROX", "XFCE", "Old" - }; - - static const char *main_categories_registered[] = { diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 7c25334..847addc 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 13 17:01:01 UTC 2009 - andrea@opensuse.org - -- added LXDE patch, since this is now a valide DE - ------------------------------------------------------------------- Thu Aug 20 10:52:02 CEST 2009 - beineri@opensuse.org diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index ee9431a..d79c1e0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -24,10 +24,9 @@ License: GPL v2 or later Group: Development/Tools/Other Version: 0.15 Release: 84 -Source0: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils -Patch0: desktop-file-utils-suse-keys.patch -Patch1: desktop-file-utils-LXDE-key.patch +Patch: desktop-file-utils-suse-keys.patch PreReq: /bin/rm /bin/rmdir Requires: aaa_base >= 10.1 Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils @@ -43,8 +42,7 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec %prep %setup -%patch0 -%patch1 -p1 +%patch %build %configure \