rpms/Macaulay2/devel Macaulay2-0.9.10-cout.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 Macaulay2.spec, 1.18, 1.19 sources, 1.3, 1.4 Macaulay2-0.9.8-64bit.patch, 1.1, NONE Macaulay2-0.9.8-cout.patch, 1.1, NONE Macaulay2-0.9.8-gcc4.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore Macaulay2.spec sources 
Added Files:
	Macaulay2-0.9.10-cout.patch 
Removed Files:
	Macaulay2-0.9.8-64bit.patch Macaulay2-0.9.8-cout.patch 
	Macaulay2-0.9.8-gcc4.patch 
Log Message:
* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-0.2.20060710svn
- 0.9.10


Macaulay2-0.9.10-cout.patch:

--- NEW FILE Macaulay2-0.9.10-cout.patch ---
--- Macaulay2-0.9.10/Macaulay2/e/x_factor.cpp.cout	2006-06-20 15:50:05.000000000 -0500
+++ Macaulay2-0.9.10/Macaulay2/e/x_factor.cpp	2006-07-10 14:33:16.000000000 -0500
@@ -266,10 +266,10 @@
 
     // debugging display routines to be called from gdb
     // needs factory to be configured without option --disable-streamio 
-    void showvar(Variable &t) { cout << t << endl; }
-    void showcf(CanonicalForm &t) { cout << t << endl; }
-    void showcfl(CFList &t) { cout << t << endl; }
-    void showcffl(CFFList &t) { cout << t << endl; }
+    //void showvar(Variable &t) { cout << t << endl; }
+    //void showcf(CanonicalForm &t) { cout << t << endl; }
+    //void showcfl(CFList &t) { cout << t << endl; }
+    //void showcffl(CFFList &t) { cout << t << endl; }
 static struct enter_factory foo2;
 static struct enter_M2 b2;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2006 17:52:42 -0000	1.3
+++ .cvsignore	12 Jul 2006 17:35:30 -0000	1.4
@@ -1 +1 @@
-M2-0.9.8-cvs20060327.tar.bz2
+Macaulay2-0.9.10-20060710svn.tar.bz2


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Macaulay2.spec	10 Jul 2006 18:40:01 -0000	1.18
+++ Macaulay2.spec	12 Jul 2006 17:35:30 -0000	1.19
@@ -1,27 +1,26 @@
 
-%define beta cvs20060327
+%define beta 20060710svn
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.8
-Release: 0.5.%{beta}%{?dist}
+Version: 0.9.10
+Release: 0.2.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
 #Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz
-Source:	 M2-0.9.8-%{beta}.tar.bz2
+Source0: Macaulay2-%{version}-%{beta}.tar.bz2
+Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source1: Macaulay2.png
-Source2: Macaulay2.desktop
+Source10: Macaulay2.png
+Source11: Macaulay2.desktop
 
 Patch0: Macaulay2-0.9.8-optflags.patch
 Patch1: Macaulay2-0.9.8-htmlview.patch
-Patch2: Macaulay2-0.9.8-cout.patch
+Patch2: Macaulay2-0.9.10-cout.patch
 Patch3: Macaulay2-0.9.8-infodir.patch
-Patch4: Macaulay2-0.9.8-gcc4.patch
-Patch5: Macaulay2-0.9.8-64bit.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
@@ -41,7 +40,7 @@
 BuildRequires: info
 # etags
 BuildRequires: emacs-common
-Source10: etags.sh
+Source20: etags.sh
 # M2-help
 Requires: htmlview
 
@@ -61,7 +60,7 @@
 Requires: %{name} = %{version}-%{release}
 ## %{_datadir}/emacs/site-lisp
 #Requires: emacs-common
-## /usr/bin/emacs
+## %{_bindir}/emacs
 Requires: emacs
 %description emacs
 %{summary}.
@@ -69,16 +68,16 @@
 
 
 %prep
-%setup -q -n M2
+%setup -q 
 
-install -m755 %{SOURCE10} ./etags
+install -p -m755 %{SOURCE20} ./etags
 
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .htmlview
 %patch2 -p1 -b .cout
 %patch3 -p1 -b .infodir
-%patch4 -p1 -b .gcc4
-%patch5 -p1 -b .64bit
+
+[ -f configure -a -f include/config.h ] || make 
 
 
 %build
@@ -87,6 +86,7 @@
 export PATH=/sbin:`pwd`:$PATH
 
 %configure  \
+  --disable-encap \
   --disable-dumpdata \
   --disable-optimize \
   --disable-static \
@@ -107,7 +107,7 @@
 make install prefix=$RPM_BUILD_ROOT%{_prefix}
 
 # app img
-install -p -m644 -D %{SOURCE1} \
+install -p -m644 -D %{SOURCE10} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -115,7 +115,7 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --vendor fedora \
   --add-category "X-Fedora" \
-  %{SOURCE2}
+  %{SOURCE11}
 
 ## Unpackaged files
 
@@ -155,10 +155,13 @@
 
 
 %changelog
-* Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.6.cvs20060327
+* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-0.2.20060710svn
+- 0.9.10
+
+-* 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
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Apr 2006 17:52:42 -0000	1.3
+++ sources	12 Jul 2006 17:35:30 -0000	1.4
@@ -1 +1 @@
-b215fc27d49332879d0641cbcf5cba55  M2-0.9.8-cvs20060327.tar.bz2
+8bd1c3c221a68331386b8d3af2f96241  Macaulay2-0.9.10-20060710svn.tar.bz2


--- Macaulay2-0.9.8-64bit.patch DELETED ---


--- Macaulay2-0.9.8-cout.patch DELETED ---


--- Macaulay2-0.9.8-gcc4.patch DELETED ---