[dia] De-vendorize desktop file on F19+ (https://fedorahosted.org/fesco/ticket/1077)

Christoph Wickert cwickert at fedoraproject.org
Sun Feb 17 12:04:23 UTC 2013


commit 7915178d46e3ea4939d4edbd0eb9bebb02e9e72d
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Feb 17 13:04:15 2013 +0100

    De-vendorize desktop file on F19+ (https://fedorahosted.org/fesco/ticket/1077)

 dia.spec |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/dia.spec b/dia.spec
index b0be673..407cc35 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,6 +1,6 @@
 Name:           dia
 Version:        0.97.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Diagram drawing program
 Group:          Applications/Multimedia
@@ -51,7 +51,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libcairo*
 
 # below is the desktop file and icon stuff.
-desktop-file-install --vendor fedora  --delete-original \
+desktop-file-install --delete-original \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora            \
+%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
   --remove-category Application                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -77,9 +80,13 @@ fi
 %doc doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd samples/
 %{_bindir}/%{name}
 %{_libdir}/%{name}/*.so
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1.*
 %{_datadir}/%{name}
+%if 0%{?fedora} && 0%{?fedora} < 19
 %{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
 %dir %{_libdir}/%{name}
 # find_lang --with-gnome desn't find the following because it's just a symlink
 %{_datadir}/gnome/help/%{name}/C
@@ -87,6 +94,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sat Feb 14 2013 Christoph Wickert <cwickert at fedoraproject.org> - 1:0.97.2-3
+- De-vendorize desktop file on F19+ (https://fedorahosted.org/fesco/ticket/1077)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.97.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list