rpms/mona/devel mona.spec,1.5,1.6

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/mona/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12830/devel

Modified Files:
	mona.spec 
Log Message:
Use the new (X)Emacs macros to simplify the spec file.



Index: mona.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mona/devel/mona.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mona.spec	25 Jul 2009 14:58:13 -0000	1.5
+++ mona.spec	5 Jan 2010 17:51:05 -0000	1.6
@@ -1,27 +1,6 @@
 %define upver 1.4
 %define uprel 13
 
-# 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.2
-%define emacs_lispdir %{_datadir}/emacs/site-lisp
-%else
-%define emacs_version %(pkg-config emacs --modversion)
-%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
-%endif
-
-# If the xemacs-devel package has installed a pkgconfig file, use that to
-# determine install locations and Emacs version at build time, otherwise set
-# defaults.
-%if %($(pkg-config xemacs) ; echo $?)
-%define xemacs_version 21.5
-%define xemacs_lispdir %{_datadir}/xemacs/site-packages/lisp
-%else
-%define xemacs_version %(pkg-config xemacs --modversion)
-%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
-%endif
-
 Name:           mona
 Version:        %{upver}r%{uprel}
 Release:        3%{?dist}
@@ -71,7 +50,8 @@ programs that access the Mona library in
 %package emacs
 Group:          Applications/Engineering
 Summary:        Emacs mode for editing Mona files
-Requires:       %{name}-libs = %{version}-%{release}, emacs(bin) >= %{emacs_version}
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       emacs(bin) >= %{_emacs_version}
 
 %description emacs
 Emacs mode for editing Mona files.
@@ -87,7 +67,8 @@ Source Elisp code for Emacs mode for edi
 %package xemacs
 Group:          Applications/Engineering
 Summary:        XEmacs mode for editing Mona files
-Requires:       %{name}-libs = %{version}-%{release}, xemacs(bin) >= %{xemacs_version}
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       xemacs(bin) >= %{_xemacs_version}
 
 %description xemacs
 XEmacs mode for editing Mona files.
@@ -127,11 +108,11 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/xema
 
 cd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/mona
 cp -p $RPM_BUILD_ROOT%{_datadir}/mona-mode.el .
-emacs -batch -no-site-file -f batch-byte-compile mona-mode.el
+%_emacs_bytecompile mona-mode.el
 
 cd $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp
 mv $RPM_BUILD_ROOT%{_datadir}/mona-mode.el .
-xemacs -batch -no-site-file -f batch-byte-compile mona-mode.el
+%_xemacs_bytecompile mona-mode.el
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,21 +148,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files emacs
 %defattr(-,root,root,-)
-%dir %{emacs_lispdir}/mona
-%{emacs_lispdir}/mona/mona-mode.elc
+%dir %{_emacs_sitelispdir}/mona
+%{_emacs_sitelispdir}/mona/mona-mode.elc
 
 %files emacs-el
 %defattr(-,root,root,-)
-%{emacs_lispdir}/mona/mona-mode.el
+%{_emacs_sitelispdir}/mona/mona-mode.el
 
 %files xemacs
 %defattr(-,root,root,-)
-%dir %{xemacs_lispdir}
-%{xemacs_lispdir}/mona-mode.elc
+%dir %{_xemacs_sitelispdir}
+%{_xemacs_sitelispdir}/mona-mode.elc
 
 %files xemacs-el
 %defattr(-,root,root,-)
-%{xemacs_lispdir}/mona-mode.el
+%{_xemacs_sitelispdir}/mona-mode.el
 
 %changelog
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4r13-3