[parcellite] Fix desktop vendor conditionals

[Christoph Wickert]

commit 3300a58b45efb130a814736310da48e630058f6d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue May 14 23:24:27 2013 +0200

    Fix desktop vendor conditionals

 parcellite.spec |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/parcellite.spec b/parcellite.spec
index 5320c4a..1591574 100644
--- a/parcellite.spec
+++ b/parcellite.spec
@@ -1,10 +1,8 @@
-%if (0%{?fedora} && 0%{?fedora}) < 19
-%global with_desktop_vendor_tag 1
-%endif
+Review: https://bugzilla.redhat.com/show_bug.cgi?id=442473
 
 Name:           parcellite
 Version:        1.1.4
-Release:        2%{?prerelease:.%{?prerelease}}%{?dist}
+Release:        3%{?prerelease:.%{?prerelease}}%{?dist}
 Summary:        A lightweight GTK+ clipboard manager
 
 Group:          User Interface/Desktops
@@ -44,19 +42,19 @@ make install DESTDIR=%{buildroot} INSTALL='install -p'
 %find_lang %{name}
 
 desktop-file-install \
-%if %{with_desktop_vendor_tag}
-  --vendor fedora \
-%endif
-  --delete-original                                        \
-  --remove-category=Application                            \
-  --dir=%{buildroot}%{_datadir}/applications          \
-  %{buildroot}%{_datadir}/applications/%{name}.desktop
+    %if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+        --vendor fedora \
+    %endif
+    --delete-original \
+    --remove-category=Application \
+    --dir=%{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install                                       \
-  --delete-original                                        \
-  --add-category=TrayIcon                                  \
-  --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/     \
-  %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop
+desktop-file-install \
+    --delete-original \
+    --add-category=TrayIcon \
+    --dir=%{buildroot}%{_sysconfdir}/xdg/autostart \
+    %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}-startup.desktop
 
 
 %clean
@@ -74,6 +72,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 14 2013 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.4-3
+- Fix desktop vendor conditionals
+
 * Wed May 01 2013 Jon Ciesla <limburgher at gmail.com> - 1.1.4-2
 - Drop desktop vendor tag.