[lxtask] Fix desktop vendor conditionals

[Christoph Wickert]

commit 37e0d1765efdb62682dfd187a0cabe5876629508
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue May 14 15:02:16 2013 +0200

    Fix desktop vendor conditionals

 lxtask.spec |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/lxtask.spec b/lxtask.spec
index 61ce5b2..fa05606 100644
--- a/lxtask.spec
+++ b/lxtask.spec
@@ -1,11 +1,8 @@
-%if (0%{?fedora} && 0%{?fedora}) < 19
-%global with_desktop_vendor_tag 1
-%endif
-
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=445140
 
 Name:           lxtask
 Version:        0.1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Lightweight and desktop independent task manager
 
 Group:          User Interface/Desktops
@@ -39,7 +36,10 @@ Patch5:         lxtask-0.1.4-update-translations.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel > 2.6, gettext, intltool, desktop-file-utils
+BuildRequires:  gtk2-devel > 2.6
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  intltool
 
 %description
 LXTask is a lightweight task manager derived from xfce4 task manager with all
@@ -64,15 +64,17 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+
 desktop-file-install \
-%if %{with_desktop_vendor_tag}
-  --vendor fedora \
-%endif
-  --delete-original                                        \
-  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+    %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+    --vendor fedora \
+    %endif
+    --delete-original \
+    --dir=%{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %find_lang %{name}
 
 
@@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 14 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.4-6
+- Fix desktop vendor conditionals
+
 * Fri Apr 26 2013 Jon Ciesla <limburgher at gmail.com> - 0.1.4-5
 - Drop desktop vendor tag.