rpms/Macaulay2/devel Macaulay2.spec,1.16,1.17

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2830

Modified Files:
	Macaulay2.spec 
Log Message:
* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.9.8-0.5.cvs20060327
- -emacs subpkg lives again



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Macaulay2.spec	5 May 2006 13:14:30 -0000	1.16
+++ Macaulay2.spec	10 Jul 2006 18:27:46 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.8
-Release: 0.4.%{beta}%{?dist}
+Release: 0.5.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
@@ -12,8 +12,6 @@
 #Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz
 Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709
-#ExcludeArch: x86_64 ppc64
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
@@ -51,14 +49,24 @@
 
 Obsoletes: Macaulay2-docs < %{version}-%{release} 
 Provides:  Macaulay2-docs = %{version}-%{release}
-Obsoletes: Macaulay2-emacs < %{version}-%{release}
-Provides:  Macaulay2-emacs = %{version}-%{release}
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
+%package emacs
+Summary: %{name} emacs mode
+Group:	 Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+## %{_datadir}/emacs/site-lisp
+#Requires: emacs-common
+## /usr/bin/emacs
+Requires: emacs
+%description emacs
+%{summary}.
+
+
 
 %prep
 %setup -q -n M2
@@ -129,11 +137,9 @@
 %defattr(-,root,root,-)
 %doc Macaulay2/README Macaulay2/CHANGES Macaulay2/COPYING
 %{_bindir}/M2
-%{_bindir}/M2-emacs
 %{_bindir}/M2-help
 %{_bindir}/M2-load-libs
 %{_datadir}/Macaulay2/
-%{_datadir}/emacs/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 # FIXME
@@ -142,8 +148,16 @@
 %{_mandir}/man1/M2.1*
 %{_mandir}/man1/M2-help.1*
 
+%files emacs
+%defattr(-,root,root,-)
+%{_bindir}/M2-emacs
+%{_datadir}/emacs/site-lisp/*
+
 
 %changelog
+* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net. 0.9.8-0.5.cvs20060327
+- -emacs subpkg lives again
+
 * Fri May 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.4.cvs20060327
 - 64bit patch (#188709)