[xsane] retain vendor tag up to Fedora 18

Nils Philippsen nphilipp at fedoraproject.org
Wed Mar 6 16:59:02 UTC 2013


commit feeefeb95fdea46172625e7d33b156fea69e03ff
Author: Nils Philippsen <nils at redhat.com>
Date:   Wed Mar 6 17:58:54 2013 +0100

    retain vendor tag up to Fedora 18

 xsane.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/xsane.spec b/xsane.spec
index 958d349..ee63f12 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -1,6 +1,12 @@
 # if you rebuild, please change bugtracker_url accordingly:
 %global bugtracker_url http://bugzilla.redhat.com
 
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%bcond_with desktop_vendor_tag
+%else
+%bcond_without desktop_vendor_tag
+%endif
+
 %global gimpplugindir %(gimptool --gimpplugindir 2>/dev/null || echo INVALID)/plug-ins
 %global iconrootdir %{_datadir}/icons/hicolor
 
@@ -164,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  \
+desktop-file-install %{?with_desktop_vendor_tag:--vendor fedora} \
     --dir %{buildroot}%{_datadir}/applications \
     src/xsane.desktop
 
@@ -203,7 +209,7 @@ 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
+%{_datadir}/applications/%{?with_desktop_vendor_tag:fedora-}xsane.desktop
 %{_datadir}/pixmaps/xsane.xpm
 %{iconrootdir}
 
@@ -218,6 +224,9 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Wed Mar 06 2013 Nils Philippsen <nils at redhat.com>
+- retain vendor tag up to Fedora 18
+
 * Mon Feb 12 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 0.998-17
 - Add BR: ImageMagick for identify
 


More information about the scm-commits mailing list