[lxappearance] Fix desktop vendor conditionals

[Christoph Wickert]

commit c6d1c3c50c999089d73e0a838dfd9369ca795811
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue May 14 14:34:59 2013 +0200

    Fix desktop vendor conditionals
    
    - Make build verbose

 lxappearance.spec |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/lxappearance.spec b/lxappearance.spec
index ab5a42a..c0a8d80 100644
--- a/lxappearance.spec
+++ b/lxappearance.spec
@@ -1,8 +1,4 @@
-# review at https://bugzilla.redhat.com/show_bug.cgi?id=442269
-
-%if (0%{?fedora} && 0%{?fedora}) < 19
-%global with_desktop_vendor_tag 1
-%endif
+# Review: https://bugzilla.redhat.com/show_bug.cgi?id=442269
 
 %global git_snapshot 0
 
@@ -20,7 +16,7 @@
  
 Name:           lxappearance
 Version:        0.5.2
-Release:        4%{?git_version:.%{?git_version}}%{?dist}
+Release:        5%{?git_version:.%{?git_version}}%{?dist}
 Summary:        Feature-rich GTK+ theme switcher for LXDE
 
 Group:          User Interface/Desktops
@@ -34,7 +30,10 @@ Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{vers
 %endif
 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
 Requires:       lxsession >= 0.4.0
 
 %description
@@ -64,19 +63,21 @@ for LXAppearance.
 %{?git_version:sh autogen.sh}
 #FIXME add --enable-dbus once we have lxsession >= 0.4.9
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
+
 desktop-file-install \
-%if %{with_desktop_vendor_tag}
-  --vendor fedora \
-%endif
-  --delete-original \
-  --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 \
+    --dir=%{buildroot}%{_datadir}/applications \
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %find_lang %{name}
 
 
@@ -100,6 +101,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 14 2013 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.2-5
+- Fix desktop vendor conditionals
+- Make build verbose
+
 * Fri Apr 26 2013 Jon Ciesla <limburgher at gmail.com> - 0.5.2-4
 - Drop desktop vendor tag.