[wallpapoz] F-19: kill vendorization of desktop file (fpc#247)

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Feb 9 12:32:46 UTC 2013


commit 37c8407f1119f629e60d09d309949acb6531c2cf
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sat Feb 9 21:32:19 2013 +0900

    F-19: kill vendorization of desktop file (fpc#247)

 wallpapoz.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/wallpapoz.spec b/wallpapoz.spec
index 4860005..cf734fa 100644
--- a/wallpapoz.spec
+++ b/wallpapoz.spec
@@ -8,7 +8,7 @@
 %define         mainver         0.6.2
 %undefine         betaver
 #%%define         svnver          svn92_trunk
-%define         fedorarel      4
+%define         fedorarel      5
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -146,7 +146,9 @@ export PATH=$(pwd)/TMPBINDIR:$PATH
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
+%if 0%{?fedora} < 19
    --vendor fedora \
+%endif
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -188,9 +190,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/launcher_wallpapoz.sh
 %{_datadir}/gnome/help/%{name}/
 
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Feb  9 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.6.2-5
+- F-19: kill vendorization of desktop file (fpc#247)
+
 * Sat Jan 19 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.6.2-4
 - Support LXDE
 


More information about the scm-commits mailing list