From 04113718eab701a09f8fdf68b1792f6031329ad80603877660054c17d3070cb2 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 10 Sep 2010 11:15:25 +0000 Subject: [PATCH] Accepting request 47692 from home:vuntz:branches:X11:common:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/47692 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=13 --- desktop-file-utils-0.15.tar.bz2 | 3 -- desktop-file-utils-0.17.tar.bz2 | 3 ++ desktop-file-utils-LXDE-key.patch | 12 ------- desktop-file-utils.changes | 56 +++++++++++++++++++++++++++++++ desktop-file-utils.spec | 49 ++++++++++++++++----------- ready | 0 6 files changed, 89 insertions(+), 34 deletions(-) delete mode 100644 desktop-file-utils-0.15.tar.bz2 create mode 100644 desktop-file-utils-0.17.tar.bz2 delete mode 100644 desktop-file-utils-LXDE-key.patch delete mode 100644 ready 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.17.tar.bz2 b/desktop-file-utils-0.17.tar.bz2 new file mode 100644 index 0000000..c1fb6bf --- /dev/null +++ b/desktop-file-utils-0.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1028fe6060575af4431cddc4c98dcf72bcdd3942b5fd5458ba36f5ab0ce3c0b +size 280494 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..6024cdb 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Sep 10 12:34:14 CEST 2010 - vuntz@opensuse.org + +- Update to version 0.17: + + desktop-file-validate: + - accept chemical/* mime types as valid types + - make icon names with an extension for Icon key a non-fatal + error + + update-desktop-database: + - accept chemical/* mime types as valid types + - ignore --verbose if --quiet is also passed + - make sure to always output lists in the keyfile we generate + + misc: + - improve build system + - update documentation + - add man pages +- Tag desktop-file-utils-suse-keys.patch. + +------------------------------------------------------------------- +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..34e2939 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.17) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,24 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: desktop-file-utils -BuildRequires: glib2-devel pkg-config +Version: 0.17 +Release: 1 License: GPLv2+ +Summary: Utilities for Manipulating Desktop Files +Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils Group: Development/Tools/Other -Version: 0.15 -Release: 86 Source0: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.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 -Patch1: desktop-file-utils-LXDE-key.patch -PreReq: /bin/rm /bin/rmdir +BuildRequires: glib2-devel +BuildRequires: pkg-config +PreReq: /bin/rm +PreReq: /bin/rmdir Requires: aaa_base -Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Utilities for Manipulating Desktop Files %description This packages contains a couple of command line utilities for @@ -42,25 +43,30 @@ More information about desktop files can be found at: http://freedesktop.org/wiki/Specifications/desktop-entry-spec %prep -%setup +%setup -q %patch0 -%patch1 -p1 %build %configure \ --with-lispdir=%{_datadir}/emacs/site-lisp -make %{?jobs:-j%jobs} +%__make %{?_smp_mflags} %install %makeinstall -mkdir -p $RPM_BUILD_ROOT/sbin/conf.d -install %{S:1} $RPM_BUILD_ROOT/sbin/conf.d +# 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 %{buildroot}/sbin/conf.d +install %{S:1} %{buildroot}/sbin/conf.d # Create ghosts based on default $XDG_DATA_DIRS: -mkdir -p $RPM_BUILD_ROOT/usr/share/applications -touch $RPM_BUILD_ROOT/usr/share/applications/mimeinfo.cache +mkdir -p %{buildroot}%{_datadir}/applications +touch %{buildroot}%{_datadir}/applications/mimeinfo.cache %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %postun # It is not allowed by FHS to own this file in RPM package, but we can @@ -74,12 +80,17 @@ fi %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{_bindir}/* +%{_bindir}/desktop-file-install +%{_bindir}/desktop-file-validate +%{_bindir}/update-desktop-database +%ghost %{_datadir}/applications/mimeinfo.cache +%{_mandir}/man1/desktop-file-install.1* +%{_mandir}/man1/desktop-file-validate.1* +%{_mandir}/man1/update-desktop-database.1* # Own directories to not require emacs installed. %dir %{_datadir}/emacs %dir %{_datadir}/emacs/site-lisp %{_datadir}/emacs/site-lisp/*.el* -%ghost %{_datadir}/applications/mimeinfo.cache /sbin/conf.d/SuSEconfig.* %changelog diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000