From 9e21dff9b4cd3eef1362aee90da05d0847efd0a4 Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Tue, 12 Oct 2010 09:50:05 +0530
Subject: [PATCH] - Merge-review cleanup (#225681)

---
 desktop-file-utils.spec | 59 ++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec
index bf002c3..fbc07f2 100644
--- a/desktop-file-utils.spec
+++ b/desktop-file-utils.spec
@@ -1,16 +1,16 @@
+%global pkg desktop-file-utils
+%global pkgname desktop-file-utils
+
 Summary: Utilities for manipulating .desktop files
 Name: desktop-file-utils
 Version: 0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.freedesktop.org/software/desktop-file-utils
 Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.bz2
-Source1: desktop-file.prov
-# https://bugs.freedesktop.org/show_bug.cgi?id=12018
 License: GPLv2+
 Group: Development/Tools
 
-BuildRequires: glib2-devel >= 2.12.0
-BuildRequires: emacs
+BuildRequires: glib2-devel
 
 %description
 .desktop files are used to describe an application for inclusion in
@@ -20,32 +20,59 @@ http://www.freedesktop.org/standards/, and desktop-file-install
 which installs a desktop file to the standard directory, optionally
 fixing it up in the process.
 
+%package -n     emacs-%{pkg}
+Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
+Group:          Applications/Editors
+BuildArch:      noarch
+BuildRequires:  emacs
+Requires:       emacs(bin) >= %{_emacs_version}
+
+%description -n emacs-%{pkg}
+%{pkgname} is an add-on package for GNU Emacs. 
+
+%package -n     emacs-%{pkg}-el
+Summary:        Elisp source files for %{pkgname} under GNU Emacs
+Group:          Applications/Editors
+BuildArch:      noarch
+Requires:       emacs-%{pkg} = %{version}-%{release}
+
+%description -n emacs-%{pkg}-el
+This package contains the elisp source files for %{pkgname} under 
+GNU Emacs. You do not need to install this package to run %{pkgname}. 
+Install the %{name} package to use %{pkgname} with GNU Emacs.
+
+
 %prep
 %setup -q
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-# add the provides script
-# disable for now, Panu seems to sehip this in rpm-build
-#install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop-file.prov
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg} 
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README NEWS
 %{_bindir}/*
-%{_datadir}/emacs/site-lisp/
-#%{_libdir}/rpm/desktop-file.prov
+
+%files -n emacs-%{pkg}
+%defattr(-,root,root,-)
+%doc
+%{_emacs_sitelispdir}/%{pkg}/*.elc
+
+%files -n emacs-%{pkg}-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/%{pkg}/*.el
 
 %changelog
+* Sat Sep 25 2010 Parag Nemade <paragn AT fedoraproject.org> - 0.16-2
+- Merge-review cleanup (#225681)
+
 * Thu Apr  1 2010 Matthias Clasen <mclasen@redhat.com> 0.16-1
 - Update to 0.16