Accepting request 722634 from home:iznogood:branches:X11:common:Factory

New upstream release

OBS-URL: https://build.opensuse.org/request/show/722634
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=75
This commit is contained in:
Dirk Mueller 2019-08-13 11:39:00 +00:00 committed by Git OBS Bridge
parent 4eb4de82d8
commit 0e20a77c5e
5 changed files with 25 additions and 31 deletions

View File

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

View File

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

View File

@ -1,14 +0,0 @@
diff -Nura desktop-file-utils-0.23/src/validate.c desktop-file-utils-0.23_new/src/validate.c
--- desktop-file-utils-0.23/src/validate.c 2016-06-19 01:00:22.000000000 +0800
+++ desktop-file-utils-0.23_new/src/validate.c 2019-06-19 17:58:15.104352109 +0800
@@ -366,8 +366,9 @@
{ DESKTOP_STRING_TYPE, "Exec", TRUE, FALSE, FALSE, handle_exec_key }
};
+/* This should be the same list as in xdg-specs/menu/menu-spec.xml */
static const char *show_in_registered[] = {
- "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "Cinnamon", "EDE", "Old"
+ "GNOME", "KDE", "LXDE", "LXQt", "MATE", "Razor", "ROX", "TDE", "Unity", "XFCE", "EDE", "Cinnamon", "Pantheon", "Old"
};
static struct {

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Jul 31 21:17:49 UTC 2019 - bjorn.lie@gmail.com
- Update to version 0.24:
+ Allow desktop file spec version 1.2.
+ Add Budgie, Deepin, Enlightenment and Pantheon to list of
registered desktop environments.
+ Sort output lines internally to conserve reproducibility.
+ Use pledge(2) on OpenBSD to limit capabilities.
+ Fix missing ; when appending to a list not ending with one.
+ Add font as valid media type.
+ Fix broken emacs blocking compile.
- Drop desktop-file-utils-add-Pantheon.patch: Fixed upstream.
- Drop no longer needed manual install of emacs lisp file.
- Use modern macros.
-------------------------------------------------------------------
Wed Jul 31 16:41:20 CEST 2019 - sbrabec@suse.com

View File

@ -17,7 +17,7 @@
Name: desktop-file-utils
Version: 0.23
Version: 0.24
Release: 0
Summary: Utilities for Manipulating Desktop Files
License: GPL-2.0-or-later
@ -28,8 +28,7 @@ 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-FIX-UPSTREAM desktop-file-utils-add-Pantheon.patch fdo#105785 bnc#1094774 qzhao@suse.com -- Backporting upstream patch to Add Pantheon to desktop env list.
Patch1: desktop-file-utils-add-Pantheon.patch
BuildRequires: glib2-devel
BuildRequires: pkg-config
#!BuildIgnore: dbus-1-x11
@ -48,22 +47,15 @@ More information about desktop files can be found at:
http://freedesktop.org/wiki/Specifications/desktop-entry-spec
%prep
%setup -q
%patch0
%patch1 -p1
%autosetup -p0
%build
%configure \
--with-lispdir=%{_datadir}/emacs/site-lisp
make %{?_smp_mflags} V=1
--with-lispdir=%{_datadir}/emacs/site-lisp
%make_build
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
# we don't want to buildrequire emacs, but recent automake make it
# impossible to install a lisp file without emacs installed. So we
# manually do it.
test ! -f %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el
install -D -m644 misc/desktop-entry-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el
%make_install
# Install suse-update-mime-defaults
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults
# Install rpm macros