[kdesvn] Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

Toshio くらとみ toshio at fedoraproject.org
Wed Mar 6 22:15:10 UTC 2013


commit 08bdf9b086cfd2781a7e42e66711576a763a8e82
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 14:14:55 2013 -0800

    Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077

 kdesvn.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/kdesvn.spec b/kdesvn.spec
index 8c0567c..066ce16 100644
--- a/kdesvn.spec
+++ b/kdesvn.spec
@@ -1,6 +1,6 @@
 Name:           kdesvn
 Version:        1.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
 Group:          Development/Tools
@@ -57,7 +57,10 @@ make install VERBOSE=1 DESTDIR=$RPM_BUILD_ROOT
 popd
 
 # Desktop file
-desktop-file-install --vendor=fedora \
+desktop-file-install \
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
+       --vendor=fedora \
+%endif
        --add-category=Application \
        --delete-original --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
        $RPM_BUILD_ROOT%{_datadir}/applications/kde4/%{name}.desktop
@@ -87,7 +90,11 @@ xdg-icon-resource forceupdate --theme hicolor
 %{_bindir}/kdesvnaskpass
 %{_libdir}/kde4/*
 %{_libdir}/libsvnqt.so.*
+%if (0%{?fedora} && 0%{?fedora} < 19) || ( 0%{?rhel} && 0%{?rhel} < 7)
 %{_datadir}/applications/kde4/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/kde4/%{name}.desktop
+%endif
 %{_datadir}/kde4/apps/kconf_update/
 %{_datadir}/kde4/apps/kdesvn/
 %{_datadir}/kde4/apps/kdesvnpart/
@@ -108,6 +115,9 @@ xdg-icon-resource forceupdate --theme hicolor
 
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.0-3
+- Remove vendor prefix from desktop files in F19+ https://fedorahosted.org/fesco/ticket/1077
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list