[emacs-color-theme/el6/master] emacs-color-theme on EL6

[Arun SAG]

commit 0f5d9d27e622b16ff2e6f234de44b8c6ff6a0187
Author: Arun SAG <sagarun at gmail.com>
Date:   Mon Feb 21 21:49:25 2011 +0530

    emacs-color-theme on EL6

 emacs-color-theme.spec |   46 +++++++++++++++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/emacs-color-theme.spec b/emacs-color-theme.spec
index a015fab..d14a354 100644
--- a/emacs-color-theme.spec
+++ b/emacs-color-theme.spec
@@ -1,9 +1,19 @@
 %global pkg color-theme
 %global pkgname Emacs Color Themes
 
+%if %($(pkg-config emacs) ; echo $?)
+%global emacs_version 21.1
+%global emacs_lispdir %{_datadir}/emacs/site-lisp
+%global emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
+%else
+%global emacs_version %(pkg-config emacs --modversion)
+%global emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
+%global emacs_startdir %(pkg-config emacs --variable sitestartdir)
+%endif
+
 Name:		emacs-%{pkg}
 Version:	6.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Color themes for Emacs
 
 Group:		Applications/Editors
@@ -19,11 +29,11 @@ Patch0:		emacs-%{pkg}-fix-compile.patch
 Patch1:		emacs-%{pkg}-fix-readme.patch
 #Patch to fix License file
 Patch2:		emacs-%{pkg}-fix-copying-eol.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:	noarch
 BuildRequires:	emacs
-Requires:	emacs(bin) >= %{_emacs_version}
+Requires:	emacs >= %{emacs_version}
 
 %description
 %{pkgname} is an add-on package for GNU Emacs.
@@ -52,27 +62,33 @@ Install the %{name} package to use %{pkgname} with GNU Emacs.
 make %{?_smp_mflags}
 
 %install
-mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{pkg}
-mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{pkg}/themes
-mkdir -p %{buildroot}%{_emacs_sitestartdir}/
-cp %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}/
-cp *.el *.elc %{buildroot}%{_emacs_sitelispdir}/%{pkg}
-cp themes/*.el themes/*.elc %{buildroot}%{_emacs_sitelispdir}/%{pkg}/themes
+mkdir -p %{buildroot}%{emacs_lispdir}/%{pkg}
+mkdir -p %{buildroot}%{emacs_lispdir}/%{pkg}/themes
+mkdir -p %{buildroot}%{emacs_startdir}/
+cp %{SOURCE1} %{buildroot}%{emacs_startdir}/
+cp *.el *.elc %{buildroot}%{emacs_lispdir}/%{pkg}
+cp themes/*.el themes/*.elc %{buildroot}%{emacs_lispdir}/%{pkg}/themes
+
+%clean
+%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_emacs_sitelispdir}/%{pkg}/*.elc
-%{_emacs_sitelispdir}/%{pkg}/themes/*.elc
-%dir %{_emacs_sitelispdir}/%{pkg}
-%{_emacs_sitestartdir}/emacs-color-theme-init.el
+%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_lispdir}/%{pkg}/themes/*.elc
+%dir %{emacs_lispdir}/%{pkg}
+%{emacs_startdir}/emacs-color-theme-init.el
 
 %files -n %{name}-el
 %defattr(-,root,root,-)
-%{_emacs_sitelispdir}/%{pkg}/*.el
-%{_emacs_sitelispdir}/%{pkg}/themes/*.el
+%{emacs_lispdir}/%{pkg}/*.el
+%{emacs_lispdir}/%{pkg}/themes/*.el
 
 %changelog
+* Sat Feb 19 2011 Arun SAG <sagarun at gmail.com> - 6.6.0-4
+- Fix spec file for EPEL
+
 * Sun May 9 2010 Arun SAG <sagarun at gmail.com> - 6.6.0-3
 - clean section removed
 - Added startup file emacs-color-theme-init.el