[saoimage] Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077

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


commit aba4bce31d9818375a6f4adfda78d18bf6485cee
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 25 17:38:30 2013 -0800

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

 saoimage.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/saoimage.spec b/saoimage.spec
index 48d6e7b..ec8d57c 100644
--- a/saoimage.spec
+++ b/saoimage.spec
@@ -1,6 +1,6 @@
 Name:           saoimage
 Version:        1.35.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Utility for displaying astronomical images
 
 Group:          Amusements/Graphics
@@ -74,7 +74,10 @@ make -f makefile.linux install_saobin install_saoman    \
         SAOBINDIR=$RPM_BUILD_ROOT%{_bindir}/            \
         SAOMANDIR=$RPM_BUILD_ROOT%{_mandir}/man1/
 
-desktop-file-install --vendor=fedora %{SOURCE1}         \
+desktop-file-install %{SOURCE1}         \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+        --vendor=fedora \
+%endif
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications
 
 install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
@@ -107,6 +110,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Feb 25 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.35.1-12
+- Remove --vendor from desktop-file-install for F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.35.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list