[emacs-lua] Use Emacs macros from build system
Tim Niemueller
timn at fedoraproject.org
Tue Jan 21 10:07:35 UTC 2014
commit febf75c040a32238dca6062a7f30a92199157b2d
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date: Tue Jan 21 11:07:45 2014 +0100
Use Emacs macros from build system
emacs-lua.spec | 46 +++++++++++++++-------------------------------
1 files changed, 15 insertions(+), 31 deletions(-)
---
diff --git a/emacs-lua.spec b/emacs-lua.spec
index eddf98a..9373f8a 100644
--- a/emacs-lua.spec
+++ b/emacs-lua.spec
@@ -4,23 +4,11 @@
%define gitrev g040bc8f
%define gitrev_dir 3ec8f27
-# If the emacs-el package has installed a pkgconfig file, use that to determine
-# install locations and Emacs version at build time, otherwise set defaults.
-%if %($(pkg-config emacs) ; echo $?)
-%define emacs_version 22.1
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
-%endif
-
Name: emacs-%{pkg}
Version: 20130419
# Omit gitrev here because it is actually a stable release,
# but the only download URL is a zipball from github
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lua major mode for GNU Emacs
Group: Applications/Editors
@@ -28,12 +16,11 @@ License: GPLv2+
URL: http://lua-mode.luaforge.net
Source0: https://github.com/immerrr/lua-mode/zipball/rel-20130419/immerrr-lua-mode-rel-20130419-0-g040bc8f.zip
Source1: lua-init.el
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: emacs(bin), emacs-el >= 22.1-2
+BuildRequires: emacs(bin), emacs-el >= 24.3
BuildRequires: pkgconfig
-Requires: emacs(bin) >= %{emacs_version}
+Requires: emacs(bin) >= 24.3
%description
A GNU Emacs major mode for editing Lua code.
@@ -54,32 +41,29 @@ with GNU Emacs.
%build
-emacs -batch -f batch-byte-compile lua-mode.el
+%{_emacs_bytecompile} lua-mode.el
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
-mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
-install -p -m 0644 lua-mode.el $RPM_BUILD_ROOT%{emacs_lispdir}
-install -p -m 0644 lua-mode.elc $RPM_BUILD_ROOT%{emacs_lispdir}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+install -p -m 0644 lua-mode.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}
+install -p -m 0644 lua-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}
+install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
%files
-%defattr(-,root,root,-)
-%{emacs_startdir}/lua-init.el
-%{emacs_lispdir}/lua-mode.elc
+%{_emacs_sitestartdir}/lua-init.el
+%{_emacs_sitelispdir}/lua-mode.elc
%files el
-%defattr(-,root,root,-)
-%{emacs_lispdir}/lua-mode.el
+%{_emacs_sitelispdir}/lua-mode.el
%changelog
+* Tue Jan 21 2014 Tim Niemueller <tim at niemueller.de> 20130419-2
+- Use Emacs macros from build system
+
* Tue Jan 21 2014 Tim Niemueller <tim at niemueller.de> 20130419-1
- Update to latest stable release, fixes bz #1006896
More information about the scm-commits
mailing list