From 6729de07e3eba774bfe79b293b2fd1e5c732b3c4 Mon Sep 17 00:00:00 2001
From: pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
Date: Sat, 27 Apr 2013 16:06:07 -0300
Subject: [PATCH] Add workaround to rpm scriptlets error, and surf-geometry to
 path.

---
 sagemath.spec | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/sagemath.spec b/sagemath.spec
index 5107242..15b935a 100644
--- a/sagemath.spec
+++ b/sagemath.spec
@@ -74,7 +74,7 @@ Name:		sagemath
 Group:		Applications/Engineering
 Summary:	A free open-source mathematics software system
 Version:	5.8
-Release:	7%{?dist}
+Release:	8%{?dist}
 # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
 # Additionally, every $files section has a comment with the license name
 # before files with that license
@@ -977,6 +977,7 @@ module load 4ti2-%{_arch}
 %if %{have_lrcalc}
 module load lrcalc-%{_arch}
 %endif
+module load surf-geometry-%{_arch}
 export PATH=$SAGE_LOCAL/bin:\$PATH
 export SINGULARPATH=%{_libdir}/Singular/LIB
 export SINGULAR_BIN_DIR=%{_libdir}/Singular
@@ -1147,14 +1148,19 @@ rm -r %{buildroot}%{python_sitearch}/sagenb/data/sage3d
 rm -fr $DOT_SAGE
 
 ########################################################################
-%post core -p /sbin/ldconfig
+%post		core
+/sbin/ldconfig
+exit 0
 
-%postun core -p /sbin/ldconfig
+%postun		core
+/sbin/ldconfig
+exit 0
 
 # Use symlinks and a minor patch to the notebook to not bundle jmol
 %post		notebook
 ln -sf %{_javadir}/JmolApplet.jar %{python_sitearch}/sagenb/data/jmol/
 ln -sf %{_javadir}/vecmath.jar %{python_sitearch}/sagenb/data/jmol/
+exit 0
 
 %postun		notebook
 if [ $1 -eq 0 ] ; then
@@ -1164,10 +1170,15 @@ if [ $1 -eq 0 ] ; then
 	rmdir %{python_sitearch}/sagenb/data &&
 	    rmdir %{python_sitearch}/sagenb
 fi
+exit 0
 
-%post		sagetex -p %{_bindir}/mktexlsr
+%post		sagetex
+%{_bindir}/mktexlsr
+exit 0
 
-%postun		sagetex -p %{_bindir}/mktexlsr
+%postun		sagetex
+%{_bindir}/mktexlsr
+exit 0
 
 ########################################################################
 %files
@@ -1377,6 +1388,10 @@ fi
 
 ########################################################################
 %changelog
+* Sat Apr 27 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.8-8
+- Add surf-geometry to path for proper Singular plotting
+- Add workaround to an rpm scriptlet problem (#877651#89)
+
 * Tue Apr 23 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 5.8-7
 - Correct problem of package requiring a -devel file to work.