From f8859c95d060eeb5a4440d6167b3d0f9a9f945ad Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 25 May 2021 16:51:17 +0100 Subject: [PATCH] Remove duplicate emacs.desktop from /usr/share/emacs/27.2/etc/. --- emacs.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/emacs.spec b/emacs.spec index 62b184d..5121a46 100644 --- a/emacs.spec +++ b/emacs.spec @@ -364,13 +364,13 @@ install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir -# Remove duplicate emacs.service file -rm %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}.service - # Install desktop files desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ %SOURCE7 +# Remove duplicate desktop-related files +rm %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}.{desktop,service} + # # Create file lists # @@ -480,6 +480,7 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %changelog * Tue May 25 2021 Peter Oliver - 1:27.2-4 - Prefer upstream emacs.desktop. +- Remove duplicate emacs.desktop from /usr/share/emacs/27.2/etc/. * Mon Apr 26 2021 Dan Čermák - 1:27.2-3 - Add emacs-modula2.patch