[qmmp] clog
Toshio くらとみ
toshio at fedoraproject.org
Sat Feb 23 07:44:35 UTC 2013
commit 40cb499f87244d96cc8db681666baf295f6b6728
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Fri Feb 22 23:44:23 2013 -0800
clog
qmmp.spec | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/qmmp.spec b/qmmp.spec
index 466e20a..769458f 100644
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -1,6 +1,6 @@
Name: qmmp
Version: 0.6.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Qt-based multimedia player
Group: Applications/Multimedia
@@ -90,8 +90,11 @@ make %{?_smp_mflags} VERBOSE=1
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
# Install desktop file
-desktop-file-install --delete-original --vendor fedora --dir \
- %{buildroot}%{_datadir}/applications \
+desktop-file-install --delete-original \
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+ --vendor fedora \
+%endif
+ --dir %{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/qmmp.desktop
# new files since 0.3.0, using Vendor is deprecated, so just validate
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}_cue.desktop
@@ -107,7 +110,11 @@ rm -rf %{buildroot}
%{_bindir}/qmmp
%{_libdir}/qmmp
%{_libdir}/libqmmp*.so.*
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
%{_datadir}/applications/fedora-%{name}.desktop
+%else
+%{_datadir}/applications/%{name}.desktop
+%endif
%{_datadir}/applications/%{name}_cue.desktop
%{_datadir}/applications/%{name}_dir.desktop
%{_datadir}/applications/%{name}_enqueue.desktop
@@ -135,6 +142,9 @@ fi
%changelog
+* Fri Feb 22 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.6-2
+- Remove --vendor from desktop-file-install for F19 https://fedorahosted.org/fesco/ticket/1077
+
* Tue Jan 29 2013 Karel Volný <kvolny at redhat.com> 0.6.6-1
- new version
- see the upstream changelog at http://qmmp.ylsoftware.com/index_en.php
More information about the scm-commits
mailing list