rpms/emacs-common-pmd/devel emacs-common-pmd.spec,1.1,1.2

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/emacs-common-pmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11305/devel

Modified Files:
	emacs-common-pmd.spec 
Log Message:
Use the new (X)Emacs macros to simplify and correct the spec file.



Index: emacs-common-pmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-pmd/devel/emacs-common-pmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- emacs-common-pmd.spec	9 Sep 2009 21:28:09 -0000	1.1
+++ emacs-common-pmd.spec	5 Jan 2010 17:41:28 -0000	1.2
@@ -1,26 +1,6 @@
 %global pkg pmd
 %global pkgname pmd-emacs
 
-%if %($(pkg-config emacs) ; echo $?)
-%global emacs_version  22.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
-
-%if %($(pkg-config xemacs) ; echo $?)
-%global xemacs_version  21.5
-%global xemacs_lispdir  %{_datadir}/xemacs/site-packages/lisp
-%global xemacs_startdir %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%else
-%global xemacs_version  %(pkg-config xemacs --modversion)
-%global xemacs_lispdir  %(pkg-config xemacs --variable sitepkglispdir)
-%global xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
-%endif
-
 Name:           emacs-common-%{pkg}
 Version:        0.6
 Release:        2%{?dist}
@@ -63,7 +43,7 @@ This package contains the files common t
 %package -n emacs-%{pkg}
 Summary:        Compiled elisp files to run %{pkgname} under GNU Emacs
 Group:          Development/Tools
-Requires:       emacs(bin) >= %{emacs_version}
+Requires:       emacs(bin) >= %{_emacs_version}
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 Requires:       pmd
 
@@ -85,7 +65,7 @@ emacs-%{pkg} package to use %{pkgname} w
 %package -n xemacs-%{pkg}
 Summary:        Compiled elisp files to run %{pkgname} under XEmacs
 Group:          Development/Tools
-Requires:       xemacs(bin) >= %{xemacs_version}
+Requires:       xemacs(bin) >= %{_xemacs_version}
 Requires:       xemacs-packages-extra
 Requires:       emacs-common-%{pkg} = %{version}-%{release}
 Requires:       pmd
@@ -117,18 +97,18 @@ chmod a-x pmd.el
 %install
 rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
-mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
-emacs -batch -no-site-file -f batch-byte-compile pmd.el
-cp -p pmd.el* $RPM_BUILD_ROOT%{emacs_lispdir}/%{pkg}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+%_emacs_bytecompile pmd.el
+cp -p pmd.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
-mkdir -p $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
-mkdir -p $RPM_BUILD_ROOT%{xemacs_startdir}
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 rm -f pmd.elc
-xemacs -batch -no-site-file -f batch-byte-compile pmd.el
-cp -p pmd.el* $RPM_BUILD_ROOT%{xemacs_lispdir}/%{pkg}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{xemacs_startdir}
+%_xemacs_bytecompile pmd.el
+cp -p pmd.el* $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 
 
 %clean
@@ -141,23 +121,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n emacs-%{pkg}
 %defattr(-,root,root,-)
-%dir %{emacs_lispdir}/%{pkg}
-%{emacs_lispdir}/%{pkg}/%{pkg}.elc
-%{emacs_startdir}/%{pkg}.el
+%dir %{_emacs_sitelispdir}/%{pkg}
+%{_emacs_sitelispdir}/%{pkg}/%{pkg}.elc
+%{_emacs_sitestartdir}/%{pkg}.el
 
 %files -n emacs-%{pkg}-el
 %defattr(-,root,root,-)
-%{emacs_lispdir}/%{pkg}/%{pkg}.el
+%{_emacs_sitelispdir}/%{pkg}/%{pkg}.el
 
 %files -n xemacs-%{pkg}
 %defattr(-,root,root,-)
-%dir %{xemacs_lispdir}/%{pkg}
-%{xemacs_lispdir}/%{pkg}/%{pkg}.elc
-%{xemacs_startdir}/%{pkg}.el
+%dir %{_xemacs_sitelispdir}/%{pkg}
+%{_xemacs_sitelispdir}/%{pkg}/%{pkg}.elc
+%{_xemacs_sitestartdir}/%{pkg}.el
 
 %files -n xemacs-%{pkg}-el
 %defattr(-,root,root,-)
-%{xemacs_lispdir}/%{pkg}/%{pkg}.el
+%{_xemacs_sitelispdir}/%{pkg}/%{pkg}.el
 
 
 %changelog