[publican: 3/3] Update to match f19, fix vendor tag.

[Jon Ciesla]

commit 6c9a3b27c4f0f1369e53a886ebe32a69aeef5b6a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue May 14 08:51:02 2013 -0500

    Update to match f19, fix vendor tag.

 publican.spec |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/publican.spec b/publican.spec
index 939c6a5..080f863 100644
--- a/publican.spec
+++ b/publican.spec
@@ -10,13 +10,19 @@
 # required for desktop file install
 %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
 
+%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
+
 %define TESTS 1
 %define brand common
 %define wwwdir /var/www/html/docs
 
 Name:           publican
 Version:        3.1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
@@ -190,7 +196,11 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop
 sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop
 
-desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
+desktop-file-install \
+%if 0%{?with_desktop_vendor_tag}
+	--vendor="%{my_vendor}" \
+%endif
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 for file in po/*.po; do
     lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
@@ -247,7 +257,7 @@ rm -rf $RPM_BUILD_ROOT
 %files doc
 %defattr(-,root,root,-)
 %doc Users_Guide/publish/desktop/*
-%{_datadir}/applications/%{my_vendor}-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %doc fdl.txt
 
 %files common-web
@@ -256,6 +266,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 14 2013 Jon Ciesla <limburgher at gmail.com> - 3.1.5-2
+- Drop desktop vendor tag.
+
 * Wed Mar 20 2013 Rüdiger Landmann <rlandmann at redhat.com> 3.1.5-1
 - patch for XSL newlines broken in F18 and newer
 - patch for PDFs built with wkhtmltopdf built against system QT