[jd] F-19: kill vendorization of desktop file (fpc#247)

[Mamoru Tasaka]

commit 4b25cb58e51cf9e98b120b3a1a29cf2e83a1054b
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sat Feb 9 17:29:06 2013 +0900

    F-19: kill vendorization of desktop file (fpc#247)

 jd.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/jd.spec b/jd.spec
index 4602939..d8b5cd7 100644
--- a/jd.spec
+++ b/jd.spec
@@ -19,7 +19,7 @@
 ##########################################
 # Defined by vendor
 #
-%define         vendor_rel    3
+%define         vendor_rel    4
 %define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
@@ -116,7 +116,9 @@ export TZ='Asia/Tokyo'
 %{__install} -p -m 644 %{name}.png $RPM_BUILD_ROOT%{icondir}
 
 desktop-file-install \
+%if 0%{?fedora} < 19
    --vendor %{vendorname} \
+%endif
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -140,11 +142,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README
 %{_bindir}/%{name}
-%{_datadir}/applications/%{vendorname}-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 %{icondir}/%{name}.png
 
 %changelog
+* Sat Feb  9 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.8.6-0.4.svn4081_trunk
+- F-19: kill vendorization of desktop file (fpc#247)
+
 * Thu Feb 07 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.8.6-0.3.svn4081_trunk
 - F-19: rebuild for new gnutls