1
0

Accepting request 97257 from home:vuntz:branches:X11:common:Factory

Update to 0.19

OBS-URL: https://build.opensuse.org/request/show/97257
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=33
This commit is contained in:
Vincent Untz 2011-12-20 15:31:46 +00:00 committed by Git OBS Bridge
parent 95aeaa7bd1
commit df719f716f
6 changed files with 52 additions and 38 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9449956c1c8caa75281a3322b2bb433db42610942f0ceeaa65ccd9636c04231
size 256340

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f805c44fc6943d2d9d2acfe2aa4c6edc1fa17b1807e4e950c8ce50111ddc81b
size 99808

View File

@ -1,8 +1,10 @@
--- src/validate.c
Index: src/validate.c
===================================================================
--- src/validate.c.orig
+++ src/validate.c
@@ -284,6 +284,9 @@
@@ -306,6 +306,9 @@ static struct {
//FIXME: it's not deprecated, but got removed from the spec temporarly
{ DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key },
{ DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key },
+ /* SuSE specific */
+ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL },

View File

@ -1,21 +0,0 @@
commit 47322e554cc5388a3e6325f36b7d07a13f124594
Author: Vincent Untz <vuntz@gnome.org>
Date: Thu Mar 31 21:58:44 2011 +0530
Add Unity to list of registered environments
See http://lists.freedesktop.org/archives/xdg/2011-March/011856.html
diff --git a/src/validate.c b/src/validate.c
index 04bc8d0..9c399a3 100644
--- a/src/validate.c
+++ b/src/validate.c
@@ -338,7 +338,7 @@ static struct {
};
static const char *show_in_registered[] = {
- "GNOME", "KDE", "LXDE", "ROX", "XFCE", "Old"
+ "GNOME", "KDE", "LXDE", "ROX", "Unity", "XFCE", "Old"
};
static struct {

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Tue Dec 20 15:17:51 UTC 2011 - vuntz@opensuse.org
- Update to version 0.19:
+ desktop-file-install:
- respect order of edit options
- add --add-not-show-in/--remove-not-show-in options
- add options to set Name, GenericName, Comment, Icon keys
- add --set-key/--set-value options to set an arbitrary key
- remove localized keys when setting/removing a key
- copy translations when copying a key
- create a desktop-file-edit symlink to desktop-file-install to
simply edit .desktop files (without having to pass --dir)
- look at RPM_BUILD_ROOT to know where to install desktop files
- minor UI improvements
+ desktop-file-validate:
- add Unity to list of registered environments
- deal with various zz-application/zz-winassoc-XXX mime types
- mark all zz-application/* MIME types as aliases
- add support for updated Keywords key
+ update-desktop-database:
- deal with various zz-application/zz-winassoc-XXX mime types
- mark all zz-application/* MIME types as aliases
- ignore desktop files with Hidden=true
+ misc:
- modernize build system a bit
- update man pages
- Add xz BuildRequires because we can't build a package for a
xz-compressed tarball without explicitly specifying that... See
bnc#697467 for more details.
- Remove /bin/rm and /bin/rmdir PreReq: those were only needed for
the old %postun scriptlet that got removed a while ago.
- Drop desktop-file-utils-unity.patch: fixed upstream.
- Rebase desktop-file-utils-suse-keys.patch.
-------------------------------------------------------------------
Wed Oct 19 14:33:50 UTC 2011 - vuntz@opensuse.org

View File

@ -16,24 +16,21 @@
#
Name: desktop-file-utils
Version: 0.18
Release: 9
License: GPLv2+
Version: 0.19
Release: 0
Summary: Utilities for Manipulating Desktop Files
Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils
License: GPL-2.0+
Group: Development/Tools/Other
Source0: %{name}-%{version}.tar.bz2
Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils
Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
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-FIX-UPSTREAM deskopt-file-utils-unity.patch vuntz@opensuse.org -- Accept Unity as desktop environment, taken from git
Patch1: desktop-file-utils-unity.patch
BuildRequires: glib2-devel
BuildRequires: pkg-config
PreReq: /bin/rm
PreReq: /bin/rmdir
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
BuildRequires: xz
Requires: aaa_base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -47,7 +44,6 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec
%prep
%setup -q
%patch0 -p0
%patch1 -p1
%build
%configure \
@ -73,10 +69,12 @@ touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
%files
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/desktop-file-edit
%{_bindir}/desktop-file-install
%{_bindir}/desktop-file-validate
%{_bindir}/update-desktop-database
%ghost %{_datadir}/applications/mimeinfo.cache
%{_mandir}/man1/desktop-file-edit.1*
%{_mandir}/man1/desktop-file-install.1*
%{_mandir}/man1/desktop-file-validate.1*
%{_mandir}/man1/update-desktop-database.1*