From b02bf9737315579e3c80acf640bfbe00b43240051f52d878cfd2d90741b8ea32 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 10 Mar 2010 09:24:02 +0000 Subject: [PATCH] Accepting request 34474 from home:vuntz:branches:X11:common:Factory Copy from home:vuntz:branches:X11:common:Factory/desktop-file-utils via accept of submit request 34474 revision 4. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/34474 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=11 --- desktop-file-utils-0.15.tar.bz2 | 3 --- desktop-file-utils-0.16.tar.bz2 | 3 +++ desktop-file-utils-LXDE-key.patch | 12 ---------- desktop-file-utils.changes | 38 +++++++++++++++++++++++++++++++ desktop-file-utils.spec | 14 ++++++++---- 5 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 desktop-file-utils-0.15.tar.bz2 create mode 100644 desktop-file-utils-0.16.tar.bz2 delete mode 100644 desktop-file-utils-LXDE-key.patch diff --git a/desktop-file-utils-0.15.tar.bz2 b/desktop-file-utils-0.15.tar.bz2 deleted file mode 100644 index 05c96fd..0000000 --- a/desktop-file-utils-0.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dfe112460c75836094fb4fcdf6144490802949474ca154d49e4bbdb92a6b442 -size 242650 diff --git a/desktop-file-utils-0.16.tar.bz2 b/desktop-file-utils-0.16.tar.bz2 new file mode 100644 index 0000000..fe42f91 --- /dev/null +++ b/desktop-file-utils-0.16.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7960be4bf7aa4b4698e8ea333cfa0bbfa7a169029e85d6a8b5390f625155c9a3 +size 282640 diff --git a/desktop-file-utils-LXDE-key.patch b/desktop-file-utils-LXDE-key.patch deleted file mode 100644 index 00b447c..0000000 --- a/desktop-file-utils-LXDE-key.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr old-desktop-file-utils-0.15//src/validate.c desktop-file-utils-0.15/src/validate.c ---- old-desktop-file-utils-0.15//src/validate.c 2008-02-05 13:06:11.000000000 +0100 -+++ desktop-file-utils-0.15/src/validate.c 2009-12-13 18:00:29.480228379 +0100 -@@ -324,7 +324,7 @@ - }; - - static const char *show_in_registered[] = { -- "KDE", "GNOME", "ROX", "XFCE", "Old" -+ "KDE", "GNOME", "LXDE", "ROX", "XFCE", "Old" - }; - - static const char *main_categories_registered[] = { diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 6484192..c51e8aa 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Mar 10 04:21:26 CET 2010 - vuntz@opensuse.org + +- Update to version 0.16: + + desktop-file-install + - do not unlink the destination file if it's the same as the + source file in desktop-file-install + + desktop-file-validate + - check that a main category is included in the Categories + - check that categories required by another one are present + - do not always show warnings about KDE specific uses + - check that the Comment does not look like the Name and the + GenericName + - display error about multiple keys with the same name earlier + - improve MIME type check to make sure that the MIME types are + valid + - add LXDE in the list of registered OnlyShowIn values + - add "warning" to error strings to make them easily greppable + - handle AutostartCondition key, as proposed for the autostart + specification and used in GNOME + - accept empty Categories key as valid + - make new errors non-fatal to give some time to maintainers to + fix their .desktop file after a release of desktop-file-utils + - plug leak + - code cleanups + + update-desktop-database + - improve MIME type check to make sure that the MIME types are + valid + - improve error messages + - fix format string vulnerability warning + + misc + - use AM_SILENT_RULES + - improve build system +- Drop desktop-file-utils-LXDE-key.patch: fixed upstream. +- Manually install desktop-entry-mode.el since we don't want to add + a BuildRequires on emacs (that would introduce a build loop), and + recent automake require an installed emacs to install this file. + ------------------------------------------------------------------- Fri Feb 19 13:01:54 CET 2010 - vuntz@opensuse.org diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 852b8af..e751b3a 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,5 +1,5 @@ # -# spec file for package desktop-file-utils (Version 0.15) +# spec file for package desktop-file-utils (Version 0.16) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,12 +22,11 @@ Name: desktop-file-utils BuildRequires: glib2-devel pkg-config License: GPLv2+ Group: Development/Tools/Other -Version: 0.15 -Release: 86 +Version: 0.16 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils Patch0: desktop-file-utils-suse-keys.patch -Patch1: desktop-file-utils-LXDE-key.patch PreReq: /bin/rm /bin/rmdir Requires: aaa_base Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils @@ -44,7 +43,6 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec %prep %setup %patch0 -%patch1 -p1 %build %configure \ @@ -53,6 +51,12 @@ make %{?jobs:-j%jobs} %install %makeinstall +# 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 +# SuSEconfig script mkdir -p $RPM_BUILD_ROOT/sbin/conf.d install %{S:1} $RPM_BUILD_ROOT/sbin/conf.d # Create ghosts based on default $XDG_DATA_DIRS: