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

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


commit e2b096858e0104fd86081b675365055ed201edb4
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 6 14:25:00 2013 -0800

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

 klamav.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/klamav.spec b/klamav.spec
index b49b524..b6691f5 100644
--- a/klamav.spec
+++ b/klamav.spec
@@ -1,7 +1,7 @@
 Summary: Clam Anti-Virus on the KDE Desktop
 Name: klamav
 Version: 0.46
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
 Patch0: klamav-0.46-suse-clamav-path.patch
 # Upstream notified via mailing list:
@@ -59,7 +59,10 @@ make DESTDIR="${RPM_BUILD_ROOT}" install
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
 %{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop.orig
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+    --vendor fedora \
+%endif
     --delete-original \
     --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \
     ${RPM_BUILD_ROOT}%{_datadir}/applnk/Utilities/%{name}.desktop
@@ -95,6 +98,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/icons/*/*x*/apps/klamav.png
 
 %changelog
+* Wed Mar  6 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.46-12
+- 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> - 0.46-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list