rpms/Macaulay2/devel Macaulay2.spec,1.2,1.3

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	Macaulay2.spec 
Log Message:
Further mass cleanup. One or more apply :
- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.spec	10 Dec 2004 22:03:01 -0000	1.2
+++ Macaulay2.spec	5 Mar 2005 21:10:20 -0000	1.3
@@ -1,14 +1,13 @@
 # $Id$
 
-Summary: A system for algebraic geometry and commutative algebra	
-Name:    Macaulay2 
-Epoch:	 0
+Summary: System for algebraic geometry and commutative algebra
+Name:    Macaulay2
 Version: 0.9.2
 Release: 13%{?dist_tag}
-License: GPL 
+License: GPL
 Group:   Applications/Engineering
-URL:	 http://www.math.uiuc.edu/Macaulay2/
-Source:	 http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+URL:     http://www.math.uiuc.edu/Macaulay2/
+Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source1: Macaulay2.png
@@ -22,31 +21,31 @@
 Patch4: Macaulay2-0.9.2-gcc34.patch
 
 BuildRequires: desktop-file-utils
-BuildRequires: gc-devel >= 0:6.3
-BuildRequires: factory-devel >= 0:2.0.5
-BuildRequires: libfac-devel >= 0:2.0.5
-BuildRequires: gdbm-devel 
+BuildRequires: gc-devel >= 6.3
+BuildRequires: factory-devel >= 2.0.5
+BuildRequires: libfac-devel >= 2.0.5
+BuildRequires: gdbm-devel
 BuildRequires: time
 
 %description
-Macaulay 2 is a new software system devoted to supporting research in 
-algebraic geometry and commutative algebra written by Daniel R. Grayson 
+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 doc 
+%package doc
 Summary: Macaulay2 documentation
-Group: Documentation 
-Requires: %{name} = %{epoch}:%{version}
+Group: Documentation
+Requires: %{name} = %{version}
 Requires: htmlview
-Summary: Macaulay2 documentation 
+Summary: Macaulay2 documentation
 %description doc
-Macaulay2 documentation. 
+Macaulay2 documentation.
 
 %package emacs
 Summary: Macaulay2 emacs mode
 Group: Applications/Editors
 Requires: emacs
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 %description emacs
 Macaulay2 emacs mode.
 
@@ -73,9 +72,9 @@
   %{?debug_package:--disable-strip}
 
 # not smp-safe
-make 
+make
 
-# Takes a *long* time, default off 
+# Takes a *long* time, default off
 %check || :
 %{?_with_check:make check }
 
@@ -85,7 +84,7 @@
 
 # Fix locations
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
-	$RPM_BUILD_ROOT%{_bindir}/M2 
+	$RPM_BUILD_ROOT%{_bindir}/M2
 perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
 	$RPM_BUILD_ROOT%{_bindir}/M2-help
 perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*
@@ -171,9 +170,9 @@
 
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.12
 - actually *apply* gcc34 patch this time.
- 
+
 * Mon Oct 18 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.11
-- gcc34 patch 
+- gcc34 patch
 
 * Fri Oct 1 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.10
 - explicit BR versions for gc-devel, libfac-devel, factory-devel
@@ -184,7 +183,7 @@
 * Thu Jun 03 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.8
 - .desktop: remove Terminaloptions to be desktop agnostic
 - .desktop: Categories += Education;Math;Development (Devel only
-  added so it shows *somewhere* in gnome menus) 
+  added so it shows *somewhere* in gnome menus)
 
 * Tue Jun 01 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.7
 - disable default 'make check' (util/screen fails on fc2)
@@ -200,7 +199,7 @@
 - fix desktop-file-install --add-cateagories usage
 
 * Tue Dec 23 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.4
-- -emacs: use %%defattr 
+- -emacs: use %%defattr
 - -emacs: fix M2-init.el
 
 * Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.3