[dayplanner] Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Tue Feb 19 01:30:38 UTC 2013


commit 645a46c69ada9496d6edc0dc698f10e392c62148
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 18 17:29:14 2013 -0800

    Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077

 dayplanner.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/dayplanner.spec b/dayplanner.spec
index 7fad9cb..a294f55 100644
--- a/dayplanner.spec
+++ b/dayplanner.spec
@@ -3,7 +3,7 @@
 
 Name:           dayplanner
 Version:        0.10
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        An easy and clean Day Planner
 Summary(pl):    Prosty i elegancki organizer
 Summary(de):    Ein einfacher und klarer Tagesplaner
@@ -89,7 +89,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # Install desktop file
-desktop-file-install --vendor="fedora"                    \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor="fedora"                    \
+%endif
   --remove-category=X-MandrivaLinux-Office-TimeManagement \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications           \
   ./doc/%{name}.desktop
@@ -132,12 +135,19 @@ fi
 %{_bindir}/%{name}-daemon
 %{_bindir}/%{name}-notifier
 %{_datadir}/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
+%{_datadir}/applications/fedora-%{name}.desktop
+%else
 %{_datadir}/applications/fedora-%{name}.desktop
+%endif
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 %{_mandir}/man1/dayplanner*1.gz
 
 
 %changelog
+* Mon Feb 18 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10-7
+- Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list