From 0f8a5389829a2c925a2044858ac82ee51f261d08 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 8 Mar 2013 15:46:44 +0100
Subject: [PATCH] fix vendor tag retaining logic (thanks to Toshio Kuratomi)

---
 xsane.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/xsane.spec b/xsane.spec
index 374ffae..9da6e09 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -2,8 +2,10 @@
 %global bugtracker_url http://bugzilla.redhat.com
 
 # Drop the vendor tag from Fedora 19 on
-%if 0%{?fedora}%{?rhel} && (0%{?fedora} < 19 || 0%{?rhel} < 7)
+%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
@@ -20,7 +22,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.998
-Release: 18%{?dist}
+Release: 19%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-256x256.png
 # distro-specific: use "xdg-open" instead of "netscape" to launch help browser
@@ -230,6 +232,9 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Fri Mar 08 2013 Nils Philippsen <nils@redhat.com> - 0.998-19
+- fix vendor tag retaining logic (thanks to Toshio Kuratomi)
+
 * Thu Mar 07 2013 Nils Philippsen <nils@redhat.com> - 0.998-18
 - retain vendor tag up to Fedora 18