From 942213230832b66c2f4a4a0b037183f5a6d54743d9a924d5b6f1e08d61f38394 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 7 Jun 2007 11:13:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/desktop-file-utils?expand=0&rev=7 --- desktop-file-utils-0.11-encoding.patch | 15 -------------- desktop-file-utils-0.12.tar.bz2 | 3 --- desktop-file-utils-0.13.tar.bz2 | 3 +++ desktop-file-utils-suse-keys.patch | 12 +++++++++++ desktop-file-utils.changes | 12 +++++++++++ desktop-file-utils.spec | 28 ++++++++++++++++---------- suse-keys.diff | 10 --------- 7 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 desktop-file-utils-0.11-encoding.patch delete mode 100644 desktop-file-utils-0.12.tar.bz2 create mode 100644 desktop-file-utils-0.13.tar.bz2 create mode 100644 desktop-file-utils-suse-keys.patch delete mode 100644 suse-keys.diff diff --git a/desktop-file-utils-0.11-encoding.patch b/desktop-file-utils-0.11-encoding.patch deleted file mode 100644 index d842685..0000000 --- a/desktop-file-utils-0.11-encoding.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=10093 -================================================================================ ---- desktop-file-utils-0.11/src/validate.c.encoding 2006-07-31 16:34:44.000000000 +0200 -+++ desktop-file-utils-0.11/src/validate.c 2006-07-31 16:35:12.000000000 +0200 -@@ -719,10 +719,6 @@ - strcmp (val, "Legacy-Mixed") != 0) - print_fatal (filename, "unknown Encoding type \"%s\", should be one of \"UTF-8\", \"Legacy-Mixed\"\n", val); - } -- else -- { -- print_fatal (filename, "required key \"Encoding\" not found\n"); -- } - - if (!gnome_desktop_file_get_raw (df, section, - "Name", diff --git a/desktop-file-utils-0.12.tar.bz2 b/desktop-file-utils-0.12.tar.bz2 deleted file mode 100644 index cf0e8ec..0000000 --- a/desktop-file-utils-0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d100785a818323912b765d7c83a72f0d1626eebc90ca8bdd639230ce13f36dcc -size 249861 diff --git a/desktop-file-utils-0.13.tar.bz2 b/desktop-file-utils-0.13.tar.bz2 new file mode 100644 index 0000000..c37fd71 --- /dev/null +++ b/desktop-file-utils-0.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b4f124eea48ee14af28e55e6b3ba29b0f1736b98cf9ad213fcc4c8e33773e39 +size 241562 diff --git a/desktop-file-utils-suse-keys.patch b/desktop-file-utils-suse-keys.patch new file mode 100644 index 0000000..1231920 --- /dev/null +++ b/desktop-file-utils-suse-keys.patch @@ -0,0 +1,12 @@ +--- src/validate.c ++++ src/validate.c +@@ -284,6 +284,9 @@ + //FIXME: it's not deprecated, but got removed from the spec temporarly + { DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key }, + ++ /* SuSE specific */ ++ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL }, ++ + /* Keys reserved for KDE */ + + /* since 0.9.4 */ diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 3fd3734..0ef02c6 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 5 10:13:26 CEST 2007 - sbrabec@suse.cz + +- Updated to version 0.13: + * rewrite validator, and update it for desktop entry specification 1.0. + The validator should be stricter and report more useful messages. + * add --warn-kde and --no-warn-deprecated command line options to + desktop-file-validate + * port desktop-file-install to GKeyFile + * don't require --vendor for desktop-file-install + * some general module cleanup + ------------------------------------------------------------------- Wed May 2 22:10:21 CEST 2007 - dmueller@suse.de diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index b605a9d..bd721f9 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package desktop-file-utils (Version 0.12) +# spec file for package desktop-file-utils (Version 0.13) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,12 +15,11 @@ BuildRequires: emacs-nox glib2-devel pkg-config popt-devel update-desktop-files License: GNU General Public License (GPL) Group: Development/Tools/Other Autoreqprov: on -Version: 0.12 -Release: 13 +Version: 0.13 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils -Patch: desktop-file-utils-0.11-encoding.patch -Patch1: suse-keys.diff +Patch: desktop-file-utils-suse-keys.patch PreReq: /bin/rm /bin/rmdir Requires: /etc/profile.d/xdg-enviroment.sh URL: http://www.freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils @@ -43,12 +42,10 @@ Authors: %prep %setup -%patch -p1 -%patch1 +%patch %build -%configure\ - --with-lispdir=/usr/share/emacs/site-lisp +%configure make %{?jobs:-j%jobs} %install @@ -71,8 +68,8 @@ rm -rf $RPM_BUILD_ROOT # purge it. Removal on update can be ignored, SuSEconfig will create it # again, if needed. if [ -d /usr/local/share/applications ] ; then -rm -f /usr/local/share/applications/mimeinfo.cache -rmdir --ignore-fail-on-non-empty /usr/local/share/applications + rm -f /usr/local/share/applications/mimeinfo.cache + rmdir --ignore-fail-on-non-empty /usr/local/share/applications fi %files @@ -94,6 +91,15 @@ fi %ghost /opt/kde3/share/applications/mimeinfo.cache %changelog +* Tue Jun 05 2007 - sbrabec@suse.cz +- Updated to version 0.13: + * rewrite validator, and update it for desktop entry specification 1.0. + The validator should be stricter and report more useful messages. + * add --warn-kde and --no-warn-deprecated command line options to + desktop-file-validate + * port desktop-file-install to GKeyFile + * don't require --vendor for desktop-file-install + * some general module cleanup * Wed May 02 2007 - dmueller@suse.de - add patch to validate suse keys * Fri Apr 27 2007 - sbrabec@suse.cz diff --git a/suse-keys.diff b/suse-keys.diff deleted file mode 100644 index d1d576f..0000000 --- a/suse-keys.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- src/validate.c -+++ src/validate.c -@@ -495,6 +495,7 @@ struct { - { "MapNotify", validate_string, TRUE }, /* 0.9.3: deprecated */ - { "Protocols", validate_string, TRUE }, /* 0.9.3: deprecated */ - { "ServiceTypes", validate_string }, /* 0.9.4: within KDE only */ -+ { "X-SuSE-translate", validate_boolean }, - }; - - static void