rpms/Macaulay2/devel Macaulay2-0.9.95-infodir.patch, NONE, 1.1 Macaulay2-0.9.95-xdg_open.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 Macaulay2.desktop, 1.3, 1.4 Macaulay2.spec, 1.27, 1.28 sources, 1.6, 1.7 Macaulay2-0.9.8-htmlview.patch, 1.1, NONE Macaulay2-0.9.8-infodir.patch, 1.1, NONE

Mon Dec 18 21:32:22 UTC 2006

Author: rdieter

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

Modified Files:
	.cvsignore Macaulay2.desktop Macaulay2.spec sources 
Added Files:
	Macaulay2-0.9.95-infodir.patch Macaulay2-0.9.95-xdg_open.patch 
Removed Files:
	Macaulay2-0.9.8-htmlview.patch Macaulay2-0.9.8-infodir.patch 
Log Message:
* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
- Macaulay2-0.9.95


Macaulay2-0.9.95-infodir.patch:

--- NEW FILE Macaulay2-0.9.95-infodir.patch ---
--- Macaulay2-0.9.95/include/config.Makefile.in.infodir	2006-12-18 08:51:43.000000000 -0600
+++ Macaulay2-0.9.95/include/config.Makefile.in	2006-12-18 08:54:13.000000000 -0600
@@ -141,11 +141,12 @@
 $(error expected mandir @mandir@ to begin with $(prefix))
 endif
 
-infoRelDir = $(subst $(prefix)/,, at infodir@)
+#infoRelDir = $(subst $(prefix)/,, at infodir@)
 binRelDir = $(subst $(prefix)/,, at bindir@)
 dataRelDir = $(subst $(prefix)/,, at datadir@)
 libRelDir = $(subst $(prefix)/,, at libdir@)
 manRelDir = $(subst $(prefix)/,, at mandir@)
+infoRelDir = $(dataRelDir)/info
 man1RelDir = $(manRelDir)/man1
 man3RelDir = $(manRelDir)/man3
 emacsRelDir = $(dataRelDir)/emacs/site-lisp

Macaulay2-0.9.95-xdg_open.patch:

--- NEW FILE Macaulay2-0.9.95-xdg_open.patch ---
--- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
+++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
@@ -1,2 +1,2 @@
 #! /bin/sh
-${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
+${WWBROWSER:-xdg-open} "$HOME/.Macaulay2/index.html"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Aug 2006 15:54:39 -0000	1.6
+++ .cvsignore	18 Dec 2006 21:31:52 -0000	1.7
@@ -1,4 +1,3 @@
 clog
-Macaulay2-0.9.10-20060710svn.tar.bz2
-Macaulay2-0.9.20-20060724svn.tar.bz2
 Macaulay2-0.9.20-20060808svn.tar.bz2
+Macaulay2-0.9.95-src.tar.gz


Index: Macaulay2.desktop
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Macaulay2.desktop	11 Apr 2006 17:51:40 -0000	1.3
+++ Macaulay2.desktop	18 Dec 2006 21:31:52 -0000	1.4
@@ -5,5 +5,5 @@
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application
-Categories=Application;Education;Math;Scientific;
+Categories=ConsoleOnly;Education;Math;
 Encoding=UTF-8


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Macaulay2.spec	29 Aug 2006 18:27:59 -0000	1.27
+++ Macaulay2.spec	18 Dec 2006 21:31:52 -0000	1.28
@@ -1,19 +1,19 @@
 
-%define beta 20060808svn
+#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.4.%{beta}%{?dist}
+Version: 0.9.95
+Release: 1%{?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
-Source0: Macaulay2-%{version}-%{beta}.tar.bz2
+Source0: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}-src.tar.gz
+#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
@@ -23,9 +23,9 @@
 Source11: Macaulay2.desktop
 
 Patch0: Macaulay2-0.9.8-optflags.patch
-Patch1: Macaulay2-0.9.8-htmlview.patch
+Patch1: Macaulay2-0.9.95-xdg_open.patch 
 Patch2: Macaulay2-0.9.10-cout.patch
-Patch3: Macaulay2-0.9.8-infodir.patch
+Patch3: Macaulay2-0.9.95-DESTDIR.patch
 Patch4: Macaulay2-0.9.10-gcc41.patch
 
 BuildRequires: desktop-file-utils
@@ -34,7 +34,7 @@
 BuildRequires: factory-devel 
 BuildRequires: libfac-devel 
 BuildRequires: lapack
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: lapack-devel
 %endif
 BuildRequires: gdbm-devel
@@ -46,8 +46,6 @@
 # etags
 BuildRequires: emacs-common
 Source20: etags.sh
-# M2-help
-Requires: htmlview
 
 BuildRequires: automake
 
@@ -56,6 +54,11 @@
 Obsoletes: Macaulay2-emacs < %{version}-%{release}
 Provides:  Macaulay2-emacs = %{version}-%{release}
 
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+# M2-help
+Requires: xdg-utils
+
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
@@ -68,9 +71,9 @@
 install -p -m755 %{SOURCE20} ./etags
 
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 %patch2 -p1 -b .cout
-%patch3 -p1 -b .infodir
+%patch3 -p1 -b .DESTDIR
 %patch4 -p1 -b .gcc41
 
 [ -f configure -a -f include/config.h ] || make 
@@ -92,7 +95,7 @@
 make 
 
 
-%check || :
+%check 
 # util/screen dies on fc5/buildsystem (could not open pty)
 #make -k check ||:
 
@@ -100,17 +103,15 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install prefix=$RPM_BUILD_ROOT%{_prefix}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # app img
 install -p -m644 -D %{SOURCE10} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
+  --vendor="fedora" \
   %{SOURCE11}
 
 # Make a new home for emacs files
@@ -133,12 +134,10 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then 
@@ -163,8 +162,6 @@
 
 %files
 %defattr(-,root,root,-)
-#README awol on latest release.
-#doc Macaulay2/README 
 %doc Macaulay2/CHANGES Macaulay2/COPYING
 %{_bindir}/*
 %{_datadir}/Macaulay2/
@@ -179,6 +176,12 @@
 
 
 %changelog
+* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
+- Macaulay2-0.9.95
+
+* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.5.20060808svn
+- .desktop Categories: -Application,Scientific,X-Fedora +ConsoleOnly
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.4.20060808svn
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Aug 2006 15:54:39 -0000	1.6
+++ sources	18 Dec 2006 21:31:52 -0000	1.7
@@ -1,2 +1 @@
-7586384990e8151157c32efdd17356f6  Macaulay2-0.9.20-20060724svn.tar.bz2
-322a36e7dc6fc95f5e101d152fed45ee  Macaulay2-0.9.20-20060808svn.tar.bz2
+dbe13387812577b0abfdfa6c54eccecc  Macaulay2-0.9.95-src.tar.gz


--- Macaulay2-0.9.8-htmlview.patch DELETED ---


--- Macaulay2-0.9.8-infodir.patch DELETED ---


