rpms/Macaulay2/devel Macaulay2-0.9-htmlview.patch, NONE, 1.1 Macaulay2-0.9-optimize.patch, NONE, 1.1 Macaulay2-0.9.2-gcc3.patch, NONE, 1.1 Macaulay2-0.9.2-gcc34.patch, NONE, 1.1 Macaulay2-0.9.2-static.patch, NONE, 1.1 Macaulay2.desktop, NONE, 1.1 Macaulay2.png, NONE, 1.1 Macaulay2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Wed Dec 8 16:15:37 UTC 2004
Changeset from: mschwendt
Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv26691/devel
Modified Files:
.cvsignore sources
Added Files:
Macaulay2-0.9-htmlview.patch Macaulay2-0.9-optimize.patch
Macaulay2-0.9.2-gcc3.patch Macaulay2-0.9.2-gcc34.patch
Macaulay2-0.9.2-static.patch Macaulay2.desktop Macaulay2.png
Macaulay2.spec
Log Message:
auto-import Macaulay2-0.9.2-0.fdr.13.2 on branch devel from Macaulay2-0.9.2-0.fdr.13.2.src.rpm
Macaulay2-0.9-htmlview.patch:
--- NEW FILE Macaulay2-0.9-htmlview.patch ---
--- Macaulay2-0.9/bin/M2-help.in_orig Thu Sep 27 06:09:38 2001
+++ Macaulay2-0.9/bin/M2-help.in Mon Oct 29 13:54:55 2001
@@ -1,3 +1,3 @@
#! /bin/sh
M2HOME="`dirname $0`/../Macaulay2"
-${WWBROWSER:-netscape} "$M2HOME/html/index.html"
+${WWBROWSER:-htmlview} "$M2HOME/html/index.html"
Macaulay2-0.9-optimize.patch:
--- NEW FILE Macaulay2-0.9-optimize.patch ---
--- Macaulay2-0.9/include/config.Makefile.in_orig Sun Sep 9 09:55:36 2001
+++ Macaulay2-0.9/include/config.Makefile.in Mon Oct 29 11:01:53 2001
@@ -110,8 +110,8 @@
CFLAGS += -O3 -fexpensive-optimizations
CXXFLAGS += -O3 -fexpensive-optimizations
else
-CFLAGS += -O0
-CXXFLAGS += -O0
+CFLAGS +=
+CXXFLAGS +=
endif
endif
Macaulay2-0.9.2-gcc3.patch:
--- NEW FILE Macaulay2-0.9.2-gcc3.patch ---
--- Macaulay2-0.9.2/Macaulay2/e/style.hpp.gcc3 2001-08-07 22:16:19.000000000 -0500
+++ Macaulay2-0.9.2/Macaulay2/e/style.hpp 2003-09-12 08:48:39.000000000 -0500
@@ -3,7 +3,8 @@
#define _style_hh_
#include <cmath> // to get fabs(), gcc 3.0
-#include <vector.h> // just to get swap(), which is included from algobase.h by vector.h, gcc 3.0
+#include <algorithm> // to get swap(), gcc 3.0
+using namespace std;
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
--- Macaulay2-0.9.2/Macaulay2/e/x_factor.cpp.gcc3 2001-08-07 20:15:34.000000000 -0500
+++ Macaulay2-0.9.2/Macaulay2/e/x_factor.cpp 2003-09-12 08:50:41.000000000 -0500
@@ -3,7 +3,7 @@
//#if !defined(__MWERKS__)
#if 1
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#define divides ignore_this_symbol /* bits/stl_function.h contains a generic one, sigh, gcc 3.0 */
#include "interp.hpp"
#undef divides
Macaulay2-0.9.2-gcc34.patch:
--- NEW FILE Macaulay2-0.9.2-gcc34.patch ---
--- Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp.gcc34 1999-09-09 16:47:12.000000000 -0500
+++ Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp 2004-10-18 14:55:59.000000000 -0500
@@ -104,7 +104,7 @@
};
class EGB1 : public EGroebnerComputation
{
- class iterator;
+public: class iterator;
friend class iterator;
private:
// Ring information
Macaulay2-0.9.2-static.patch:
--- NEW FILE Macaulay2-0.9.2-static.patch ---
--- Macaulay2-0.9.2/Macaulay2/d/Makefile.in.static 2002-10-19 11:15:30.000000000 -0500
+++ Macaulay2-0.9.2/Macaulay2/d/Makefile.in 2002-10-19 11:18:01.000000000 -0500
@@ -308,7 +308,7 @@
###################### libraries
ifneq ($(OS),Darwin)
-ifeq "$(GCC) $(STATIC)" "yes no"
+ifeq "$(GCC) $(STATIC)" "yes"
LIBRARYOPTIONS += -Wl,-Bstatic
endif
endif
@@ -326,7 +326,7 @@
LIBRARYOPTIONS += -lstdc++
ifneq ($(OS),Darwin)
-ifeq "$(GCC) $(STATIC)" "yes no"
+ifeq "$(GCC) $(STATIC)" "yes"
LIBRARYOPTIONS += -Wl,-Bdynamic
endif
endif
--- NEW FILE Macaulay2.desktop ---
[Desktop Entry]
Name=Macaulay2
Exec=M2
Icon=Macaulay2.png
SwallowTitle=Macaulay2
Terminal=true
Type=Application
Categories=Application;Education;Math;Scientific;Development;
Encoding=UTF-8
--- NEW FILE Macaulay2.spec ---
# $Id: Macaulay2.spec,v 1.30 2004/06/03 15:42:58 rexdieter Exp $
Summary: A system for algebraic geometry and commutative algebra
Name: Macaulay2
Epoch: 0
Version: 0.9.2
Release: 0.fdr.13%{?dist_tag}.2
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source1: Macaulay2.png
Source2: Macaulay2.desktop
Patch0: Macaulay2-0.9-optimize.patch
Patch1: Macaulay2-0.9-htmlview.patch
Patch2: Macaulay2-0.9.2-static.patch
Patch3: Macaulay2-0.9.2-gcc3.patch
# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view
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: time
%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 doc
Summary: Macaulay2 documentation
Group: Documentation
Requires: %{name} = %{epoch}:%{version}
Requires: htmlview
Summary: Macaulay2 documentation
%description doc
Macaulay2 documentation.
%package emacs
Summary: Macaulay2 emacs mode
Group: Applications/Editors
Requires: emacs
Requires: %{name} = %{epoch}:%{version}
%description emacs
Macaulay2 emacs mode.
%prep
%setup -q
%patch0 -p1 -b .opt
%patch1 -p1 -b .htmlview
%patch2 -p1 -b .static
# fix gcc3 blocker, some warnings about use of deprecated headers
%patch3 -p1 -b .gcc3
# fc3/gcc34 fix
%patch4 -p1 -b .gcc34
%build
%configure \
--enable-gc-for-new \
--disable-dumpdata \
--disable-optimize \
--disable-static \
%{?debug_package:--disable-strip}
# not smp-safe
make
# Takes a *long* time, default off
%check || :
%{?_with_check:make check }
%install
%makeinstall
# Fix locations
perl -pi -e "s at M2HOME=.*@M2HOME=%{_libdir}/%{name}-%{version}@" \
$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/*
## emacs files
install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
cp -alf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/emacs/*.el \
$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
# app img
install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
%if "%{?desktop_file}" != "0"
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
desktop-file-install \
--vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category "X-Fedora" \
%{SOURCE2}
%else
install -p -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Applications/%{name}.desktop
%endif
## Unpackaged files
# %doc stuff, no need to dup in appdir
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/{README,CHANGES,COPYING}
# created by make check
find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
# .cvsignore
find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version} -name .cvsignore -exec rm -v {} \;
# unuseful files outside of build environment
find $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/packages -name "Makefile*" -exec rm -v {} \;
%clean
rm -rf $RPM_BUILD_ROOT
%preun
# Handle possibly existing dumpdata
rm -f %{_libdir}/%{name}-%{version}/libexec/Macaulay2-*-data ||:
%files
%defattr(-,root,root)
%doc Macaulay2/README Macaulay2/CHANGES
%{_bindir}/M2
%if "%{?desktop_file}" != "0"
%{_datadir}/applications/*.desktop
%else
%{_sysconfdir}/X11/applnk/*/*.desktop
%endif
%{_datadir}/pixmaps/*.png
%dir %{_libdir}/%{name}-%{version}
%{_libdir}/%{name}-%{version}/cache
%{_libdir}/%{name}-%{version}/libexec
%{_libdir}/%{name}-%{version}/m2
%{_libdir}/%{name}-%{version}/packages
# Not needed/wanted
%exclude %{_libdir}/%{name}-%{version}/setup
%files emacs
%defattr(-,root,root)
%dir %{_libdir}/%{name}-%{version}/emacs
%doc %{_libdir}/%{name}-%{version}/emacs/*.m2
%doc %{_libdir}/%{name}-%{version}/emacs/*.txt
%doc %{_libdir}/%{name}-%{version}/emacs/README
%{_libdir}/%{name}-%{version}/emacs/*.el
%{_datadir}/emacs/site-lisp/*.el
%files doc
%defattr(-,root,root)
%{_bindir}/M2-help
%{_libdir}/%{name}-%{version}/html
%{_libdir}/%{name}-%{version}/tutorial
%changelog
* Sat Oct 23 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.13
- BR: time (again)
- omit m2_dir/setup (not needed/wanted)
* 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
* 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
* Tue Aug 10 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.9
- BR: time
* 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)
* 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)
* Tue Mar 30 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.6
- desktop-file is now on by default
- use separate (not inline) .desktop file
* Mon Jan 05 2004 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.5
- fix BuildRequires: desktop-file-utils to satisfy rpmlint.
- put emacs files in emacs subdir too (to follow supplied docs)
- *really* nuke .cvsignore files
- 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: fix M2-init.el
* Mon Nov 17 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.3
- update/simplify macros
- desktop_file support.
- emacs subpkg.
- relax Req's on subpkgs to just: Requires: %%name = %%epoch:%%version
- use non-versioned BuildRequires
- remove redundant BuildRequires: gmp-devel
- remove gc patch, no longer needed.
- delete/not-package a bunch of unuseful files.
- use --disable-strip when debug_package is in use.
* Thu Nov 13 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.2
- no longer explictly Requires: emacs
* Wed Nov 05 2003 Rex Dieter <rexdieter at sf.net> 0:0.9.2-0.fdr.1
- missing Epoch: 0
* Fri Sep 12 2003 Rex Dieter <rexdieter at sf.net> 0.9.2-0.fdr.0
- fedora'ize
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 8 Dec 2004 16:11:38 -0000 1.1
+++ .cvsignore 8 Dec 2004 16:15:35 -0000 1.2
@@ -0,0 +1 @@
+Macaulay2-0.9.2-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 8 Dec 2004 16:11:38 -0000 1.1
+++ sources 8 Dec 2004 16:15:35 -0000 1.2
@@ -0,0 +1 @@
+f2181baccdb9bbe75c4f6ee61f782533 Macaulay2-0.9.2-src.tar.gz
More information about the scm-commits
mailing list