Accepting request 703095 from X11:common:Factory

OBS-URL: https://build.opensuse.org/request/show/703095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/desktop-file-utils?expand=0&rev=60
This commit is contained in:
Dominique Leuenberger 2019-05-16 20:01:57 +00:00 committed by Git OBS Bridge
commit fe0bd57269
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 8 09:36:13 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Move RPM macros to %_rpmmacrodir.
-------------------------------------------------------------------
Fri Mar 2 14:07:32 UTC 2018 - crrodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package desktop-file-utils
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -22,20 +22,19 @@ Release: 0
Summary: Utilities for Manipulating Desktop Files
License: GPL-2.0-or-later
Group: Development/Tools/Other
Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils
URL: http://www.freedesktop.org/wiki/Software/desktop-file-utils
Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
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
BuildRequires: glib2-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: xz
#!BuildIgnore: dbus-1-x11
Requires: aaa_base
Requires: awk
Requires: coreutils
#!BuildIgnore: dbus-1-x11
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This packages contains a couple of command line utilities for
@ -63,7 +62,7 @@ install -D -m644 misc/desktop-entry-mode.el %{buildroot}%{_datadir}/emacs/site-l
# Install suse-update-mime-defaults
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults
# Install rpm macros
install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.desktop-file-utils
install -D -m644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.desktop-file-utils
# Create ghosts based on default $XDG_DATA_DIRS:
mkdir -p %{buildroot}%{_datadir}/applications
touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
@ -78,7 +77,8 @@ touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
%files
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%{_bindir}/desktop-file-edit
%{_bindir}/desktop-file-install
%{_bindir}/desktop-file-validate
@ -93,6 +93,6 @@ touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
%dir %{_datadir}/emacs
%dir %{_datadir}/emacs/site-lisp
%{_datadir}/emacs/site-lisp/*.el*
%{_sysconfdir}/rpm/macros.desktop-file-utils
%{_rpmmacrodir}/macros.desktop-file-utils
%changelog