[gap] New upstream release.

[Jerry James]

commit 82b3f8498d11057c5fc8f873e983832a437916f4
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Thu May 16 10:16:10 2013 -0600

    New upstream release.

 .gitignore      |    2 +-
 gap-env.patch   |    8 ++++----
 gap-paths.patch |    6 +++---
 gap.spec        |   15 +++++++++------
 sources         |    2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbe5101..e35c6a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/gap4r6p3_2013_03_18-17_40.tar.bz2
+/gap4r6p4_2013_05_04-16_36.tar.bz2
diff --git a/gap-env.patch b/gap-env.patch
index ad3dd7f..3322d2a 100644
--- a/gap-env.patch
+++ b/gap-env.patch
@@ -1,6 +1,6 @@
---- ./src/system.c.orig	2012-07-16 11:27:25.000000000 -0600
-+++ ./src/system.c	2012-08-14 16:40:19.470468141 -0600
-@@ -1752,6 +1752,7 @@ void InitSystem (
+--- ./src/system.c.orig	2013-05-04 10:45:21.000000000 -0600
++++ ./src/system.c	2013-05-16 09:04:06.568959420 -0600
+@@ -1754,6 +1754,7 @@ void InitSystem (
      Char *              argv [] )
  {
      Char *              *ptrlist;
@@ -8,7 +8,7 @@
      UInt                i;             /* loop variable                   */
      Int res;                       /* return from option processing function */
  
-@@ -1875,6 +1876,16 @@ void InitSystem (
+@@ -1877,6 +1878,16 @@ void InitSystem (
  
  #endif
  
diff --git a/gap-paths.patch b/gap-paths.patch
index c6f385e..1a5a52f 100644
--- a/gap-paths.patch
+++ b/gap-paths.patch
@@ -9,8 +9,8 @@
  
  
  
---- ./cnf/gac.in.orig	2012-03-23 09:17:36.000000000 -0600
-+++ ./cnf/gac.in	2012-08-15 14:00:17.299605327 -0600
+--- ./cnf/gac.in.orig	2013-05-04 10:36:28.000000000 -0600
++++ ./cnf/gac.in	2013-05-16 09:00:16.226661866 -0600
 @@ -55,16 +55,16 @@
  ##  option is appended at the end of the link command after the .o
  ##  files to link.
@@ -44,7 +44,7 @@
  }
  
  
-@@ -385,17 +385,17 @@ make_compstat () {
+@@ -387,17 +387,17 @@ make_compstat () {
      objects="${gactmp}/$$compstat.o ${objects}"
  }
  
diff --git a/gap.spec b/gap.spec
index 6246f63..f37a9c9 100644
--- a/gap.spec
+++ b/gap.spec
@@ -1,11 +1,11 @@
-%global upstreamver 4r6p3
-%global pkgdate 2013_03_18-17_40
-%global gapdirname gap%(echo %upstreamver | cut -dp -f1)
+%global upstreamver 4r6p4
+%global pkgdate 2013_05_04-16_36
+%global gapdirname gap%(cut -dp -f1 <<<%upstreamver)
 %global gapdir %{_prefix}/lib/gap
 %global icondir %{_datadir}/icons/hicolor
 
 Name:           gap
-Version:        %(echo %upstreamver | sed -r "s/r|p/./g")
+Version:        %(sed -r "s/r|p/./g" <<<%upstreamver)
 Release:        1%{?dist}
 Summary:        Computational discrete algebra
 
@@ -172,7 +172,7 @@ GAP XEmacs support.
 %patch4
 
 # Replace the CFLAGS, find the math functions and sigsetjmp
-sed -re "s|(gp_cv_prog_cc_cdynoptions=)\"-fpic -Wall -O2|\1\"\$RPM_OPT_FLAGS -fPIC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DSYS_DEFAULT_PATHS='\"%{gapdir}\"'|" \
+sed -re "s|(gp_cv_prog_cc_cdynoptions=)\"-fpic -Wall -O2|\1\"\$RPM_OPT_FLAGS -fPIC -D_FILE_OFFSET_BITS=64 -DSYS_DEFAULT_PATHS='\"%{gapdir}\"'|" \
     -e "s|(gp_cv_prog_cc_cdynlinking=)\"-shared -g|\1\"\$RPM_LD_FLAGS -shared|" \
     -e '/log2 log10/iLIBS="-lm $LIBS"' \
     -e "/sigsetjmp/,\$s|(ac_fn_c_check_func.*)ac_func(.*)|\1{ac_func/sigsetjmp/__sigsetjmp}\2|" \
@@ -192,7 +192,7 @@ chmod a+x makepkgs
 
 %build
 %configure --with-gmp=system \
-  CPPFLAGS='-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DSYS_DEFAULT_PATHS=\"%{gapdir}\"'
+  CPPFLAGS='-D_FILE_OFFSET_BITS=64 -DSYS_DEFAULT_PATHS=\"%{gapdir}\"'
 # FIXME: GAP 4.5 broke %%{?_smp_mflags}
 make
 
@@ -398,6 +398,9 @@ make testinstall
 %{_xemacs_sitelispdir}/gap*.el
 
 %changelog
+* Thu May 16 2013 Jerry James <loganjerry at gmail.com> - 4.6.4-1
+- New upstream release
+
 * Thu Mar 28 2013 Jerry James <loganjerry at gmail.com> - 4.6.3-1
 - New upstream release
 
diff --git a/sources b/sources
index 8fa1062..c6fd710 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ad283643f7d5db75f48097f9b5f9ef1  gap4r6p3_2013_03_18-17_40.tar.bz2
+cdac2d2d0654985422886a39daf56160  gap4r6p4_2013_05_04-16_36.tar.bz2