rpms/Macaulay2/devel Macaulay2.spec,1.25,1.26

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.3.20060808svn
- ExcludeArch: ppc (bug #201739)
- %ghost (x)emacs site-lisp bits (using hints from fedora-rpmdevtools)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Macaulay2.spec	8 Aug 2006 15:54:39 -0000	1.25
+++ Macaulay2.spec	8 Aug 2006 19:08:41 -0000	1.26
@@ -1,10 +1,13 @@
 
 %define beta 20060808svn
+
+%define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
+%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.20
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
@@ -13,6 +16,8 @@
 Source0: Macaulay2-%{version}-%{beta}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# ppc build currently hangs, never finishes, http://bugzilla.redhat.com/201739
+ExcludeArch: ppc
 
 Source10: Macaulay2.png
 Source11: Macaulay2.desktop
@@ -25,7 +30,6 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
-# See http://bugzilla.redhat.com/bugzilla/188499
 BuildRequires: ntl-devel
 BuildRequires: factory-devel 
 BuildRequires: libfac-devel 
@@ -49,24 +53,14 @@
 
 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
-## %{_bindir}/emacs
-Requires: emacs
-%description emacs
-%{summary}.
-
-
 
 %prep
 %setup -q 
@@ -119,7 +113,19 @@
   --add-category "X-Fedora" \
   %{SOURCE11}
 
-## Unpackaged files
+# Make a new home for emacs files
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs
+mv $RPM_BUILD_ROOT%{emacs_sitelisp}/M2*.el $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs/
+ 
+for dir in %{emacs_sitelisp} %{xemacs_sitelisp} ; do
+  install -d -m755 $RPM_BUILD_ROOT$dir
+  pushd $RPM_BUILD_ROOT%{_datadir}/Macaulay2/emacs
+  for file in M2*.el ; do
+    ln -s %{_datadir}/Macaulay2/emacs/$file $RPM_BUILD_ROOT$dir
+    touch $RPM_BUILD_ROOT$dir/`basename $file .el`.elc
+  done
+  popd
+done
 
 
 %clean
@@ -134,31 +140,49 @@
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
+%triggerin -- emacs-common
+if [ -d %{emacs_sitelisp} ]; then 
+  for file in %{_datadir}/Macaulay2/emacs/M2*.el ; do
+    ln -sf $file %{emacs_sitelisp}/ ||:
+  done
+fi
+
+%triggerin -- xemacs-common
+if [ -d %{xemacs_sitelisp} ]; then
+  for file in %{_datadir}/Macaulay2/emacs/M2*.el ; do
+    ln -sf $file %{xemacs_sitelisp}/ ||:
+  done
+fi
+
+%triggerun -- emacs-common
+[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+
+%triggerun -- xemacs-common
+[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
+
 
 %files
 %defattr(-,root,root,-)
 #README awol on latest release.
 #doc Macaulay2/README 
 %doc Macaulay2/CHANGES Macaulay2/COPYING
-%{_bindir}/M2
-#{_bindir}/M2-help
-#{_bindir}/M2-load-libs
+%{_bindir}/*
 %{_datadir}/Macaulay2/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 # FIXME
 %{_docdir}/Macaulay2
 %{_infodir}/*
-%{_mandir}/man1/M2.1*
-%{_mandir}/man1/M2-help.1*
-
-%files emacs
-%defattr(-,root,root,-)
-#{_bindir}/M2-emacs
-%{_datadir}/emacs/site-lisp/*
+%{_mandir}/man1/*
+%ghost %{emacs_sitelisp} 
+%ghost %{xemacs_sitelisp}
 
 
 %changelog
+* Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.3.20060808svn
+- ExcludeArch: ppc (bug #201739)
+- %ghost (x)emacs site-lisp bits (using hints from fedora-rpmdevtools)
+
 * Tue Aug 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.2.20060808svn
 - 20060808 snapshot
 
@@ -171,9 +195,6 @@
 -* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.6.cvs20060327
 - BR: ncurses-devel
 
-* 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)