Accepting request 826233 from home:andythe_great:branches:home:cunix:branches:X11:common:Factory
Cleanup %prep section. Add # PATCH-FIX-OPENSUSE comment to Patch1. OBS-URL: https://build.opensuse.org/request/show/826233 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=77
This commit is contained in:
parent
0e20a77c5e
commit
6894623cf3
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a1de5da60cbdbe91e5c9c10ac9afee6c3deb019e0cee5fdb9a99dddc245f83d9
|
|
||||||
size 137424
|
|
BIN
desktop-file-utils-0.26.tar.xz
(Stored with Git LFS)
Normal file
BIN
desktop-file-utils-0.26.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,15 +1,17 @@
|
|||||||
Index: src/validate.c
|
diff -r -U 5 a/src/validate.c b/src/validate.c
|
||||||
===================================================================
|
--- a/src/validate.c 2020-06-19
|
||||||
--- src/validate.c.orig 2016-06-18 19:00:22.000000000 +0200
|
+++ b/src/validate.c 2020-06-29
|
||||||
+++ src/validate.c 2016-10-15 13:05:26.067464415 +0200
|
@@ -324,10 +324,13 @@
|
||||||
@@ -319,6 +319,10 @@ static DesktopKeyDefinition registered_d
|
|
||||||
|
|
||||||
{ DESKTOP_BOOLEAN_TYPE, "DBusActivatable", FALSE, FALSE, FALSE, handle_dbus_activatable_key },
|
{ DESKTOP_BOOLEAN_TYPE, "DBusActivatable", FALSE, FALSE, FALSE, handle_dbus_activatable_key },
|
||||||
|
|
||||||
|
/* Since 1.4 */
|
||||||
|
{ DESKTOP_BOOLEAN_TYPE, "PrefersNonDefaultGPU", FALSE, FALSE, FALSE, NULL },
|
||||||
|
|
||||||
+ /* SuSE specific */
|
+ /* SuSE specific */
|
||||||
+ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL },
|
+ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL },
|
||||||
+
|
|
||||||
+
|
+
|
||||||
/* Keys reserved for KDE */
|
/* Keys reserved for KDE */
|
||||||
|
|
||||||
/* since 0.9.4 */
|
/* since 0.9.4 */
|
||||||
|
{ DESKTOP_STRING_TYPE, "ServiceTypes", FALSE, FALSE, TRUE, NULL },
|
||||||
|
{ DESKTOP_STRING_TYPE, "DocPath", FALSE, FALSE, TRUE, NULL },
|
||||||
|
@ -1,3 +1,40 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 16 18:38:50 UTC 2020 - andy great <andythe_great@pm.me>
|
||||||
|
|
||||||
|
- Clean spec file.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 29 12:00:00 UTC 2020 - cunix@mail.de
|
||||||
|
|
||||||
|
- Update to version 0.26:
|
||||||
|
* Support for Autotools removed in the next release.
|
||||||
|
* update-desktop-database
|
||||||
|
+ Fix erroneous installation as "desktop-file-update"
|
||||||
|
when using the Meson build system
|
||||||
|
|
||||||
|
- Update to version 0.25:
|
||||||
|
* common
|
||||||
|
+ Add Meson build system
|
||||||
|
* desktop-file-validate
|
||||||
|
+ Allow desktop file spec version 1.4.
|
||||||
|
+ Make it possible to deprecate keys starting with "X-".
|
||||||
|
+ Add the "Implements" field from spec version 1.2.
|
||||||
|
+ Add the "PrefersNonDefaultGPU" key and deprecate "X-KDE-RunOnDiscreteGpu".
|
||||||
|
+ Set locale for correct output message encoding.
|
||||||
|
+ Add coloured output support.
|
||||||
|
+ Fix parsing of escaped double quote in quoted strings.
|
||||||
|
+ Add GNOME Flashback, GNOME Classic desktops.
|
||||||
|
|
||||||
|
- desktop-file-utils-suse-keys.patch rebased.
|
||||||
|
|
||||||
|
- Switched to Meson build system.
|
||||||
|
|
||||||
|
- "--with-lispdir" deleted because no build loop anymore visible.
|
||||||
|
|
||||||
|
- "install_man_desktop-file-edit_as_symlink.patch" added to install
|
||||||
|
duplicated manual page as a symlink instead of a file copy with
|
||||||
|
help from added script "install_man.py".
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jul 31 21:17:49 UTC 2019 - bjorn.lie@gmail.com
|
Wed Jul 31 21:17:49 UTC 2019 - bjorn.lie@gmail.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package desktop-file-utils
|
# spec file for package desktop-file-utils
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2020 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,20 +17,23 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: desktop-file-utils
|
Name: desktop-file-utils
|
||||||
Version: 0.24
|
Version: 0.26
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utilities for Manipulating Desktop Files
|
Summary: Utilities for Manipulating Desktop Files
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
URL: http://www.freedesktop.org/wiki/Software/desktop-file-utils
|
URL: https://www.freedesktop.org/wiki/Software/desktop-file-utils
|
||||||
Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
|
Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.xz
|
||||||
Source1: suse-update-mime-defaults
|
Source1: suse-update-mime-defaults
|
||||||
Source2: macros.desktop-file-utils
|
Source2: macros.desktop-file-utils
|
||||||
|
Source3: install_man.py
|
||||||
# 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.
|
# 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
|
Patch0: desktop-file-utils-suse-keys.patch
|
||||||
|
# PATCH-FIX-OPENSUSE install_man_desktop-file-edit_as_symlink.patch -- With Source3 makes manual page "desktop-file-edit.1" a symlink instead of a copy.
|
||||||
|
Patch1: install_man_desktop-file-edit_as_symlink.patch
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: pkg-config
|
BuildRequires: meson >= 0.49.0
|
||||||
|
BuildRequires: pkgconfig
|
||||||
#!BuildIgnore: dbus-1-x11
|
#!BuildIgnore: dbus-1-x11
|
||||||
# We need explicit requirement here, as these are required by
|
# We need explicit requirement here, as these are required by
|
||||||
# %%filetriggerin that could be started early during the installation
|
# %%filetriggerin that could be started early during the installation
|
||||||
@ -47,15 +50,15 @@ More information about desktop files can be found at:
|
|||||||
http://freedesktop.org/wiki/Specifications/desktop-entry-spec
|
http://freedesktop.org/wiki/Specifications/desktop-entry-spec
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p0
|
%autosetup -p1
|
||||||
|
cp %{SOURCE3} man/install_man.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%meson
|
||||||
--with-lispdir=%{_datadir}/emacs/site-lisp
|
%meson_build
|
||||||
%make_build
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%meson_install
|
||||||
# Install suse-update-mime-defaults
|
# Install suse-update-mime-defaults
|
||||||
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults
|
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults
|
||||||
# Install rpm macros
|
# Install rpm macros
|
||||||
@ -75,7 +78,6 @@ if test -x %{_bindir}/update-desktop-database ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root)
|
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS ChangeLog NEWS README
|
%doc AUTHORS ChangeLog NEWS README
|
||||||
%{_bindir}/desktop-file-edit
|
%{_bindir}/desktop-file-edit
|
||||||
@ -84,10 +86,10 @@ fi
|
|||||||
%{_bindir}/suse-update-mime-defaults
|
%{_bindir}/suse-update-mime-defaults
|
||||||
%{_bindir}/update-desktop-database
|
%{_bindir}/update-desktop-database
|
||||||
%ghost %{_datadir}/applications/mimeinfo.cache
|
%ghost %{_datadir}/applications/mimeinfo.cache
|
||||||
%{_mandir}/man1/desktop-file-edit.1*
|
%{_mandir}/man1/desktop-file-edit.1%{?ext_man}
|
||||||
%{_mandir}/man1/desktop-file-install.1*
|
%{_mandir}/man1/desktop-file-install.1%{?ext_man}
|
||||||
%{_mandir}/man1/desktop-file-validate.1*
|
%{_mandir}/man1/desktop-file-validate.1%{?ext_man}
|
||||||
%{_mandir}/man1/update-desktop-database.1*
|
%{_mandir}/man1/update-desktop-database.1%{?ext_man}
|
||||||
# Own directories to not require emacs installed.
|
# Own directories to not require emacs installed.
|
||||||
%dir %{_datadir}/emacs
|
%dir %{_datadir}/emacs
|
||||||
%dir %{_datadir}/emacs/site-lisp
|
%dir %{_datadir}/emacs/site-lisp
|
||||||
|
8
install_man.py
Normal file
8
install_man.py
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
os.symlink(
|
||||||
|
'desktop-file-install.1',
|
||||||
|
os.getenv('MESON_INSTALL_DESTDIR_PREFIX') + '/share/man/man1/desktop-file-edit.1'
|
||||||
|
)
|
12
install_man_desktop-file-edit_as_symlink.patch
Normal file
12
install_man_desktop-file-edit_as_symlink.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -r -U 5 a/man/meson.build b/man/meson.build
|
||||||
|
--- a/man/meson.build 2020-06-19
|
||||||
|
+++ b/man/meson.build 2020-06-29
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
|
||||||
|
install_man([
|
||||||
|
'desktop-file-validate.1',
|
||||||
|
'desktop-file-install.1',
|
||||||
|
'update-desktop-database.1',
|
||||||
|
- desktop_file_edit_man,
|
||||||
|
])
|
||||||
|
+meson.add_install_script('install_man.py')
|
Loading…
Reference in New Issue
Block a user