From 56dcb82b96fbaff539309bedee2d81abd8a180a18e2ac6ff75b27172fa2adfab Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 12 Oct 2010 13:49:47 +0000
Subject: [PATCH] Accepting request 50351 from home:lnussel:clamz
Forwarding to openSUSE:Factory
OBS-URL: https://build.opensuse.org/request/show/50351
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=17
---
desktop-file-utils.changes | 5 +++++
macros.desktop-file-utils | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes
index cbfa5e9..1460b1e 100644
--- a/desktop-file-utils.changes
+++ b/desktop-file-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 12 12:19:16 UTC 2010 - lnussel@suse.de
+
+- fix macros
+
-------------------------------------------------------------------
Thu Oct 7 14:11:12 CEST 2010 - vuntz@opensuse.org
diff --git a/macros.desktop-file-utils b/macros.desktop-file-utils
index 79c861f..0adcc73 100644
--- a/macros.desktop-file-utils
+++ b/macros.desktop-file-utils
@@ -19,9 +19,9 @@
if test -x %{_bindir}/update-desktop-database; then \
%if "x%1" != "x%%1" \
%{_bindir}/update-desktop-database --quiet "%1" || true \
-%endif \
- %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \
%else \
+ %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \
+%endif \
fi
# On uninstall, update the desktop database. Note: we ignore upgrades (already
@@ -32,8 +32,8 @@ if [ $1 -eq 0 ]; then
%{_bindir}/update-desktop-database --quiet "${DESKTOP_DIR}" || true \
%if "x%1" != "x%%1" \
%{_bindir}/update-desktop-database --quiet "%1" || true \
-%endif \
- %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \
%else \
+ %{_bindir}/update-desktop-database --quiet "%{_datadir}/applications" || true \
+%endif \
fi \
fi