rpms/pure/F-12 pure.spec,1.3,1.4

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/pure/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31920/F-12

Modified Files:
	pure.spec 
Log Message:
* Fri Jul  9 2010 Michel Salim <salimma at fedoraproject.org> - 0.43-3
- Emacs subpackages now adhere to packaging guidelines



Index: pure.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure/F-12/pure.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pure.spec	5 Jun 2010 16:42:14 -0000	1.3
+++ pure.spec	9 Jul 2010 11:16:20 -0000	1.4
@@ -1,17 +1,6 @@
-%if %($(pkg-config emacs) ; echo $?)
-# This will get overridden by pkg-config; defaulting to the version in F-10
-%define emacs_version 22.3
-%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:           pure
 Version:        0.43
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A term-rewriting functional programming language
 
 Group:          Development/Languages
@@ -60,13 +49,22 @@ The %{name}-doc package contains example
 
 %package -n emacs-pure
 Summary:        Pure mode for Emacs
-Group:          Applications/Editors
-Requires:       emacs(bin) >= %{emacs_version}
+Group:          Development/Languages
+Requires:       emacs(bin) >= %{_emacs_version}
 BuildArch:      noarch
 
 %description -n emacs-pure
 An Emacs mode for editing Pure source code.
 
+%package -n emacs-pure-el
+Summary:        Elisp source file for the Pure mode for Emacs
+Group:          Development/Languages
+BuildArch:      noarch
+Requires:       emacs-pure = %{version}-%{release}
+
+%description -n emacs-pure-el
+This package contains the elisp source file for the Pure mode for Emacs.
+
 
 %prep
 %setup -q
@@ -91,10 +89,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # Emacs mode files
 rm etc/*.el.in
-mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
-mkdir -p $RPM_BUILD_ROOT%{emacs_startdir}
-mv etc/*.el* $RPM_BUILD_ROOT%{emacs_lispdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{emacs_startdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+mv etc/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
 
 %check
@@ -139,12 +137,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n emacs-pure
 %defattr(-,root,root,-)
-%{emacs_lispdir}/*.el*
-%{emacs_startdir}/*
+%{_emacs_sitelispdir}/*.elc
+%{_emacs_sitestartdir}/*
+
+%files -n emacs-pure-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/*.el
 
 
 
 %changelog
+* Fri Jul  9 2010 Michel Salim <salimma at fedoraproject.org> - 0.43-3
+- Emacs subpackages now adhere to packaging guidelines
+
 * Sat Jun  5 2010 Michel Salim <salimma at fedoraproject.org> - 0.43-2
 - Fix emacs-pure summary