From 5045b21efefc798573383bdb0f3cbaf15a57be12 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 24 Jun 2020 11:35:05 +0200
Subject: [PATCH] Simplify macros usage

---
 desktop-file-utils.spec | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index 5cda909..e5c556e 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,6 +1,3 @@
-%global pkg desktop-file-utils
-%global pkgname desktop-file-utils
-
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.26
@@ -14,10 +11,10 @@ BuildRequires:  gcc
 BuildRequires: glib2-devel
 BuildRequires: emacs
 Requires: emacs-filesystem
-Provides: emacs-%{pkg} = %{version}-%{release}
-Provides: emacs-%{pkg}-el = %{version}-%{release}
-Obsoletes: emacs-%{pkg} < 0.20-3
-Obsoletes: emacs-%{pkg}-el < 0.20-3
+Provides: emacs-desktop-file-utils = %{version}-%{release}
+Provides: emacs-desktop-file-utils-el = %{version}-%{release}
+Obsoletes: emacs-desktop-file-utils < 0.20-3
+Obsoletes: emacs-desktop-file-utils-el < 0.20-3
 
 %description
 .desktop files are used to describe an application for inclusion in
@@ -38,8 +35,8 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
-mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils
+mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/desktop-file-utils
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.el
 touch $RPM_BUILD_ROOT%{_emacs_sitestartdir}/desktop-entry-mode-init.elc
 
@@ -59,7 +56,7 @@ update-desktop-database &> /dev/null || :
 %{_mandir}/man1/desktop-file-edit.1.gz
 %{_emacs_sitestartdir}/desktop-entry-mode-init.el
 %ghost %{_emacs_sitestartdir}/desktop-entry-mode-init.elc
-%{_emacs_sitelispdir}/%{pkg}
+%{_emacs_sitelispdir}/desktop-file-utils/
 
 %changelog
 * Wed Jun 24 2020 Kalev Lember <klember@redhat.com> - 0.26-1