From 03077b902e139f51aeff08791ccd78bec3bb939f Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Feb 15 2013 01:18:13 +0000 Subject: Remove --vendor from desktop-file-install on F19+ https://fedorahosted.org/fesco/ticket/1077 --- diff --git a/mail-notification.spec b/mail-notification.spec index 02b9b64..eeddb24 100644 --- a/mail-notification.spec +++ b/mail-notification.spec @@ -2,7 +2,7 @@ Name: mail-notification Version: 5.4 -Release: 67.git.%{git_revision}%{?dist} +Release: 68.git.%{git_revision}%{?dist} Summary: Status icon that informs you if you have new mail Group: Applications/Internet @@ -105,12 +105,18 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' chmod +x $RPM_BUILD_ROOT%{_libdir}/evolution/*/plugins/*.so -desktop-file-install --vendor fedora \ +desktop-file-install \ +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) + --vendor fedora \ +%endif --dir ${RPM_BUILD_ROOT}%{_datadir}/gnome/autostart/ \ --delete-original \ ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart/mail-notification.desktop -desktop-file-install --vendor fedora \ +desktop-file-install \ +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) + --vendor fedora \ +%endif --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --delete-original \ --add-category X-GNOME-NetworkSettings \ @@ -148,8 +154,8 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_sysconfdir}/gconf/schemas/mail-notification.schemas %{_bindir}/* %{_datadir}/%{name} -%{_datadir}/gnome/autostart/fedora-mail-notification.desktop -%{_datadir}/applications/fedora-mail-notification-properties.desktop +%{_datadir}/gnome/autostart/*mail-notification.desktop +%{_datadir}/applications/*mail-notification-properties.desktop %{_datadir}/gnome/help/mail-notification/ %dir %{_datadir}/omf/mail-notification/ %{_datadir}/omf/mail-notification/mail-notification-C.omf @@ -161,6 +167,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Thu Feb 14 2013 Toshio Kuratomi - 5.4-68.git.eab5c13 +- Remove --vendor from desktop-file-install on F19+ https://fedorahosted.org/fesco/ticket/1077 + * Thu Feb 14 2013 Fedora Release Engineering - 5.4-67.git.eab5c13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild