From 76243283a275a8e1ff5cdb9faffaf637d7872698 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 17 May 2013 14:07:11 +0200
Subject: [PATCH] fix vendor tag logic in a prettier way

---
 xsane.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/xsane.spec b/xsane.spec
index aac83b7..4c2e8dd 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -4,8 +4,6 @@
 # Drop the vendor tag from Fedora 19 on
 %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
 %global with_desktop_vendor_tag 1
-%else
-%global with_desktop_vendor_tag 0
 %endif
 
 %global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins
@@ -172,7 +170,7 @@ install -m 0755 build-with-gimp/src/xsane %{buildroot}%{gimpplugindir}
 # install customized desktop file
 rm %{buildroot}%{_datadir}/applications/xsane.desktop
 desktop-file-install \
-%if 0%{?with_desktop_vendor_tag}
+%if %{with desktop_vendor_tag}
     --vendor fedora \
 %endif
     --dir %{buildroot}%{_datadir}/applications \
@@ -213,7 +211,11 @@ fi
 %doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.COPYING xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
 %{_bindir}/xsane
 %{_mandir}/man1/*
-%{_datadir}/applications/*xsane.desktop
+%if %{with desktop_vendor_tag}
+%{_datadir}/applications/fedora-xsane.desktop
+%else
+%{_datadir}/applications/xsane.desktop
+%endif
 %{_datadir}/pixmaps/xsane.xpm
 %{iconrootdir}
 
@@ -228,6 +230,9 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Fri May 17 2013 Nils Philippsen <nils@redhat.com>
+- fix vendor tag logic in a prettier way
+
 * Tue May 14 2013 Jon Ciesla <limburgher@gmail.com> - 0.998-20
 - Re-fix vendor tag logic.