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

Toshio くらとみ toshio at fedoraproject.org
Thu Feb 14 23:34:01 UTC 2013


commit f9fda862cac768f2f1647a0b3dc81a3c0d608b51
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Feb 14 15:33:34 2013 -0800

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

 MyPasswordSafe.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/MyPasswordSafe.spec b/MyPasswordSafe.spec
index 90a9029..855dcc8 100644
--- a/MyPasswordSafe.spec
+++ b/MyPasswordSafe.spec
@@ -2,7 +2,7 @@
 
 Name:           MyPasswordSafe
 Version:        0.6.7
-Release:        15.%{datever}%{?dist}
+Release:        16.%{datever}%{?dist}
 Summary:        A graphical password management tool
 
 Group:          Applications/Databases
@@ -66,7 +66,10 @@ make install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 # Remove the docs, they are in the wrong place.
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc
 
-desktop-file-install --vendor="fedora"               \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor="fedora"               \
+%endif
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications    \
     %{SOURCE1}
 
@@ -80,9 +83,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc ChangeLog CHANGES COPYING README doc/manual.html doc/sshots/*.jpg
 %{_bindir}/MyPasswordSafe
 %{_datadir}/MyPasswordSafe
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-MyPasswordSafe.desktop
+%else
+%{_datadir}/applications/MyPasswordSafe.desktop
+%endif
 
 %changelog
+* Thu Feb 14 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.7-16.20061216
+- 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.6.7-15.20061216
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list