This commit is contained in:
parent
31cacbb03f
commit
9422132308
@ -1,15 +0,0 @@
|
|||||||
https://bugs.freedesktop.org/show_bug.cgi?id=10093
|
|
||||||
================================================================================
|
|
||||||
--- desktop-file-utils-0.11/src/validate.c.encoding 2006-07-31 16:34:44.000000000 +0200
|
|
||||||
+++ desktop-file-utils-0.11/src/validate.c 2006-07-31 16:35:12.000000000 +0200
|
|
||||||
@@ -719,10 +719,6 @@
|
|
||||||
strcmp (val, "Legacy-Mixed") != 0)
|
|
||||||
print_fatal (filename, "unknown Encoding type \"%s\", should be one of \"UTF-8\", \"Legacy-Mixed\"\n", val);
|
|
||||||
}
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- print_fatal (filename, "required key \"Encoding\" not found\n");
|
|
||||||
- }
|
|
||||||
|
|
||||||
if (!gnome_desktop_file_get_raw (df, section,
|
|
||||||
"Name",
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d100785a818323912b765d7c83a72f0d1626eebc90ca8bdd639230ce13f36dcc
|
|
||||||
size 249861
|
|
3
desktop-file-utils-0.13.tar.bz2
Normal file
3
desktop-file-utils-0.13.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5b4f124eea48ee14af28e55e6b3ba29b0f1736b98cf9ad213fcc4c8e33773e39
|
||||||
|
size 241562
|
12
desktop-file-utils-suse-keys.patch
Normal file
12
desktop-file-utils-suse-keys.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
--- src/validate.c
|
||||||
|
+++ src/validate.c
|
||||||
|
@@ -284,6 +284,9 @@
|
||||||
|
//FIXME: it's not deprecated, but got removed from the spec temporarly
|
||||||
|
{ DESKTOP_STRING_LIST_TYPE, "Actions", FALSE, FALSE, FALSE, handle_actions_key },
|
||||||
|
|
||||||
|
+ /* SuSE specific */
|
||||||
|
+ { DESKTOP_BOOLEAN_TYPE, "X-SuSE-translate", FALSE, FALSE, FALSE, NULL },
|
||||||
|
+
|
||||||
|
/* Keys reserved for KDE */
|
||||||
|
|
||||||
|
/* since 0.9.4 */
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 5 10:13:26 CEST 2007 - sbrabec@suse.cz
|
||||||
|
|
||||||
|
- Updated to version 0.13:
|
||||||
|
* rewrite validator, and update it for desktop entry specification 1.0.
|
||||||
|
The validator should be stricter and report more useful messages.
|
||||||
|
* add --warn-kde and --no-warn-deprecated command line options to
|
||||||
|
desktop-file-validate
|
||||||
|
* port desktop-file-install to GKeyFile
|
||||||
|
* don't require --vendor for desktop-file-install
|
||||||
|
* some general module cleanup
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed May 2 22:10:21 CEST 2007 - dmueller@suse.de
|
Wed May 2 22:10:21 CEST 2007 - dmueller@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package desktop-file-utils (Version 0.12)
|
# spec file for package desktop-file-utils (Version 0.13)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -15,12 +15,11 @@ BuildRequires: emacs-nox glib2-devel pkg-config popt-devel update-desktop-files
|
|||||||
License: GNU General Public License (GPL)
|
License: GNU General Public License (GPL)
|
||||||
Group: Development/Tools/Other
|
Group: Development/Tools/Other
|
||||||
Autoreqprov: on
|
Autoreqprov: on
|
||||||
Version: 0.12
|
Version: 0.13
|
||||||
Release: 13
|
Release: 1
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Source1: SuSEconfig.desktop-file-utils
|
Source1: SuSEconfig.desktop-file-utils
|
||||||
Patch: desktop-file-utils-0.11-encoding.patch
|
Patch: desktop-file-utils-suse-keys.patch
|
||||||
Patch1: suse-keys.diff
|
|
||||||
PreReq: /bin/rm /bin/rmdir
|
PreReq: /bin/rm /bin/rmdir
|
||||||
Requires: /etc/profile.d/xdg-enviroment.sh
|
Requires: /etc/profile.d/xdg-enviroment.sh
|
||||||
URL: http://www.freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils
|
URL: http://www.freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils
|
||||||
@ -43,12 +42,10 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch -p1
|
%patch
|
||||||
%patch1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure\
|
%configure
|
||||||
--with-lispdir=/usr/share/emacs/site-lisp
|
|
||||||
make %{?jobs:-j%jobs}
|
make %{?jobs:-j%jobs}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -71,8 +68,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
# purge it. Removal on update can be ignored, SuSEconfig will create it
|
# purge it. Removal on update can be ignored, SuSEconfig will create it
|
||||||
# again, if needed.
|
# again, if needed.
|
||||||
if [ -d /usr/local/share/applications ] ; then
|
if [ -d /usr/local/share/applications ] ; then
|
||||||
rm -f /usr/local/share/applications/mimeinfo.cache
|
rm -f /usr/local/share/applications/mimeinfo.cache
|
||||||
rmdir --ignore-fail-on-non-empty /usr/local/share/applications
|
rmdir --ignore-fail-on-non-empty /usr/local/share/applications
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -94,6 +91,15 @@ fi
|
|||||||
%ghost /opt/kde3/share/applications/mimeinfo.cache
|
%ghost /opt/kde3/share/applications/mimeinfo.cache
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 05 2007 - sbrabec@suse.cz
|
||||||
|
- Updated to version 0.13:
|
||||||
|
* rewrite validator, and update it for desktop entry specification 1.0.
|
||||||
|
The validator should be stricter and report more useful messages.
|
||||||
|
* add --warn-kde and --no-warn-deprecated command line options to
|
||||||
|
desktop-file-validate
|
||||||
|
* port desktop-file-install to GKeyFile
|
||||||
|
* don't require --vendor for desktop-file-install
|
||||||
|
* some general module cleanup
|
||||||
* Wed May 02 2007 - dmueller@suse.de
|
* Wed May 02 2007 - dmueller@suse.de
|
||||||
- add patch to validate suse keys
|
- add patch to validate suse keys
|
||||||
* Fri Apr 27 2007 - sbrabec@suse.cz
|
* Fri Apr 27 2007 - sbrabec@suse.cz
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
--- src/validate.c
|
|
||||||
+++ src/validate.c
|
|
||||||
@@ -495,6 +495,7 @@ struct {
|
|
||||||
{ "MapNotify", validate_string, TRUE }, /* 0.9.3: deprecated */
|
|
||||||
{ "Protocols", validate_string, TRUE }, /* 0.9.3: deprecated */
|
|
||||||
{ "ServiceTypes", validate_string }, /* 0.9.4: within KDE only */
|
|
||||||
+ { "X-SuSE-translate", validate_boolean },
|
|
||||||
};
|
|
||||||
|
|
||||||
static void
|
|
Loading…
x
Reference in New Issue
Block a user