pool/desktop-file-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 62144 from X11:common:Factory

Browse Source 
Accepted submit request 62144 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/62144
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/desktop-file-utils?expand=0&rev=31
This commit is contained in:
Ruediger Oertel 2011-02-20 23:50:41 +00:00 committed by Git OBS Bridge
commit 4826b44c92
3 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SuSEconfig.desktop-file-utils
View File

@ -1,15 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2005 SuSE
# Author: Stanislav Brabec <sbrabec@suse.cz>
# Ensure, that $XDG_DATA_DIRS is set properly. (#71978, #240603)
if test "$PROFILEREAD" != true ; then
. $r/etc/profile
fi
/usr/bin/update-desktop-database
#
# end
#

11
desktop-file-utils.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Feb 19 12:27:01 CET 2011 - vuntz@opensuse.org
- Drop SuSEconfig.desktop-file-utils: we don't use SuSEconfig
anymore to run update-desktop-database, since we now rely on each
individual package to do that with the %desktop_database_post and
%desktop_database_postun macros.
- Remove %postun scriptlet: nothing will touch
/usr/local/share/applications/ automatically anymore, so removing
the files there won't be needed anymore.
-------------------------------------------------------------------
Tue Jan 18 08:41:03 CET 2011 - vuntz@opensuse.org

14
desktop-file-utils.spec
View File

@ -25,7 +25,6 @@ Summary: Utilities for Manipulating Desktop Files
Url: http://www.freedesktop.org/wiki/Software/desktop-file-utils
Group: Development/Tools/Other
Source0: %{name}-%{version}.tar.bz2
Source1: SuSEconfig.desktop-file-utils
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
@ -59,9 +58,6 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec
# 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
# Install rpm macros
install -D -m644 %{S:2} %{buildroot}%{_sysconfdir}/rpm/macros.desktop-file-utils
# Create ghosts based on default $XDG_DATA_DIRS:
@ -74,15 +70,6 @@ rm -rf %{buildroot}
%post
%{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true
%postun
# It is not allowed by FHS to own this file in RPM package, but we can
# purge it. Removal on update can be ignored, SuSEconfig will create it
# again, if needed.
if [ -d /usr/local/share/applications ] ; then
rm -f /usr/local/share/applications/mimeinfo.cache
rmdir --ignore-fail-on-non-empty /usr/local/share/applications
fi
%files
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
@ -98,6 +85,5 @@ fi
%dir %{_datadir}/emacs/site-lisp
%{_datadir}/emacs/site-lisp/*.el*
%{_sysconfdir}/rpm/macros.desktop-file-utils
/sbin/conf.d/SuSEconfig.*
%changelog