gap-4.6.4

OBS-URL: https://build.opensuse.org/package/show/science/gap?expand=0&rev=8

gap-4.6.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a3848a2f910a3d5b4b294a98ec4ba00b7e67ca2a904424d2acc12d385882801
+size 36431408

gap-final-dir.diff

@@ -9,13 +9,13 @@ build: add a --with-gapdir option to specify future location of GAP
  configure.in     |    6 +++++-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/cnf/configure.in b/cnf/configure.in
+Index: gap4r6/cnf/configure.in
-index 2b9f78b..8c7a543 100644
+===================================================================
---- a/cnf/configure.in
+--- gap4r6.orig/cnf/configure.in
-+++ b/cnf/configure.in
++++ gap4r6/cnf/configure.in
-@@ -288,8 +288,11 @@ dnl ##
+@@ -352,8 +352,11 @@ AC_SUBST(CFLAGS)
- dnl ## generate a makefile
+ AC_SUBST(CPPFLAGS)
- dnl ##
+ AC_SUBST(LDFLAGS)
  
 +AC_ARG_WITH([gapbindir],
 + AS_HELP_STRING([--with-gapbindir], [Denote the final location of GAP]),
@@ -24,13 +24,13 @@ index 2b9f78b..8c7a543 100644
  AC_SUBST(gapbin)
 -gapbin=`pwd`
  
- AC_SUBST(BUILD_MODE)
+ AC_SUBST(ABI)
  AC_SUBST(ABI_CFLAGS)
-diff --git a/configure.in b/configure.in
+Index: gap4r6/configure.in
-index c24e506..7063e6f 100644
+===================================================================
---- a/configure.in
+--- gap4r6.orig/configure.in
-+++ b/configure.in
++++ gap4r6/configure.in
-@@ -59,8 +59,12 @@ AC_PROG_CC
+@@ -51,8 +51,12 @@ AC_PROG_CC
  BASECC=`basename ${CC}`
  AC_SUBST(BASECC)
  AC_PROG_MAKE_SET
@@ -42,7 +42,5 @@ index c24e506..7063e6f 100644
  AC_SUBST(gapdir)
 -gapdir=`pwd`
  
- AC_ARG_WITH(gmp,
+ AC_ARG_VAR(CONFIGNAME,[Supply a (meaningful) name for the configuration you are building.
-  AC_HELP_STRING( [--with-gmp],
+     This name will be appended to the architecture-dependent named 
--- 
-# Created with git-export-patch

gap-multiarch.diff

@@ -0,0 +1,32 @@
+
+Allow for noarch packages.
+
+---
+ configure.in |    3 +++
+ gap.shi      |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+Index: gap4r6/configure.in
+===================================================================
+--- gap4r6.orig/configure.in
++++ gap4r6/configure.in
+@@ -160,6 +160,9 @@ AC_SUBST(MAKE_GMP)
+ AC_SUBST(USE_GMP)
+ AC_SUBST(GMP_VER)
+ 
++pkgdatadir="$datadir/$PACKAGE_NAME"
++AC_SUBST([pkgdatadir])
++
+ mkdir -p bin
+ AC_OUTPUT(Makefile-${CONFIGNAME}:Makefile.in sysinfo.gap-${CONFIGNAME}:sysinfo.in bin/gap-${CONFIGNAME}.sh:gap.shi)
+ ln -sf gap-${CONFIGNAME}.sh bin/gap.sh
+Index: gap4r6/gap.shi
+===================================================================
+--- gap4r6.orig/gap.shi
++++ gap4r6/gap.shi
+@@ -61,4 +61,4 @@ fi
+ ##
+ ##  You  probably should  not change  this line,  which  finally starts  GAP.
+ ##
+-exec "$GAP_DIR/bin/$GAP_PRG" $GAP_MEM -l "$GAP_DIR" "$@"
++exec "$GAP_DIR/bin/$GAP_PRG" $GAP_MEM -l "$GAP_DIR;@datadir@/gap" "$@"

gap-no-fancy-paths.diff

@@ -1,24 +0,0 @@
-parent bed1014971e204b383cd74a48a913e294d420972 ()
-commit 96502953fcae60a727bae2866243bd1f95756d33
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Sun Jun 26 23:58:07 2011 +0200
-
-build: provide uncomplicated pathspec
----
- Makefile.in |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 6ceb28d..1bd298d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -80,6 +80,7 @@ config: bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure  bin/@target@-@BASECC@
- 
- bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure: cnf/configure.out 
- 	mkdir -p bin/@target@-@BASECC@/$(BUILD_MODE)-bit
-+	ln -s bin/@target@-@BASECC@/$(BUILD_MODE)-bit obj
- 	@rm -f bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
- 	cp cnf/configure.out bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
- 
--- 
-# Created with git-export-patch

gap-system-perl.diff

@@ -1,44 +0,0 @@
-parent 9316710832a9f6d582e1dcf3b9645e9efc8efc8f ()
-commit cfc9336244188eac1c5feac5542b3808dac0a435
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Sun Jun 26 16:22:03 2011 +0200
-
-pkg/hap: default to system perl
----
- pkg/Hap1.9/lib/PolyComplexes/prog     |    2 +-
- pkg/Hap1.9/lib/TDA/prog               |    2 +-
- pkg/Hap1.9/lib/TopologicalSpaces/prog |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pkg/Hap1.9/lib/PolyComplexes/prog b/pkg/Hap1.9/lib/PolyComplexes/prog
-index 190de99..8bb6226 100755
---- a/pkg/Hap1.9/lib/PolyComplexes/prog
-+++ b/pkg/Hap1.9/lib/PolyComplexes/prog
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Program to convert image text files to GAP matrices. 
- 
-diff --git a/pkg/Hap1.9/lib/TDA/prog b/pkg/Hap1.9/lib/TDA/prog
-index bd701da..93fed2c 100755
---- a/pkg/Hap1.9/lib/TDA/prog
-+++ b/pkg/Hap1.9/lib/TDA/prog
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Program to convert image text files to GAP matrices. 
- 
-diff --git a/pkg/Hap1.9/lib/TopologicalSpaces/prog b/pkg/Hap1.9/lib/TopologicalSpaces/prog
-index bd701da..93fed2c 100755
---- a/pkg/Hap1.9/lib/TopologicalSpaces/prog
-+++ b/pkg/Hap1.9/lib/TopologicalSpaces/prog
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Program to convert image text files to GAP matrices. 
- 
--- 
-# Created with git-export-patch

gap-ttyname-null.diff

@@ -15,18 +15,18 @@ could potentially always yield true, so the result needs to be stored
 away first.
 ---
  src/system.c |   36 ++++++++++++++++++++++++++++--------
- 1 files changed, 28 insertions(+), 8 deletions(-)
+ 1 file changed, 28 insertions(+), 8 deletions(-)
 
-diff --git a/src/system.c b/src/system.c
+Index: gap4r6/src/system.c
-index a41b46b..1c39dd4 100644
+===================================================================
---- a/src/system.c
+--- gap4r6.orig/src/system.c
-+++ b/src/system.c
++++ gap4r6/src/system.c
-@@ -2133,12 +2133,22 @@ void InitSystem (
+@@ -1819,12 +1819,22 @@ void InitSystem (
      syBuf[0].fp = fileno(stdin);
      syBuf[0].bufno = -1;
      if ( isatty( fileno(stdin) ) ) {
 -        if ( isatty( fileno(stdout) )
--          && ! SyStrcmp( ttyname(fileno(stdin)), ttyname(fileno(stdout)) ) )
+-          && ! strcmp( ttyname(fileno(stdin)), ttyname(fileno(stdout)) ) )
 +	char *in, *out;
 +
 +	in = ttyname(fileno(stdin));
@@ -42,18 +42,18 @@ index a41b46b..1c39dd4 100644
 -            syBuf[0].echo = open( ttyname(fileno(stdin)), O_WRONLY );
 +	else if (in != NULL)
 +            syBuf[0].echo = open(in, O_WRONLY);
- 	syBuf[0].isTTY = 1;
+         syBuf[0].isTTY = 1;
 +	free(in);
 +	free(out);
      }
      else {
          syBuf[0].echo = fileno(stdout);
-@@ -2147,13 +2157,23 @@ void InitSystem (
+@@ -1833,13 +1843,23 @@ void InitSystem (
      syBuf[1].echo = syBuf[1].fp = fileno(stdout); 
      syBuf[1].bufno = -1;
      if ( isatty( fileno(stderr) ) ) {
 -        if ( isatty( fileno(stdin) )
--          && ! SyStrcmp( ttyname(fileno(stdin)), ttyname(fileno(stderr)) ) )
+-          && ! strcmp( ttyname(fileno(stdin)), ttyname(fileno(stderr)) ) )
 +	char *in, *err;
 +
 +	in = isatty(fileno(stdin)) ? ttyname(fileno(stdin)) : NULL;
@@ -70,11 +70,9 @@ index a41b46b..1c39dd4 100644
 +	else if (err != NULL)
 +            syBuf[2].fp = open(err, O_RDONLY);
          syBuf[2].echo = fileno(stderr);
- 	syBuf[2].isTTY = 1;
+         syBuf[2].isTTY = 1;
 +	free(in);
 +	free(err);
      }
      else
        syBuf[2].isTTY = 0;
--- 
-# Created with git-export-patch

gap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 10 07:34:20 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 4.6.4
+- Split .spec file into multiple packages
+
 -------------------------------------------------------------------
 Thu Nov 29 15:09:28 UTC 2012 - jengelh@inai.de
 

gap4r5p1_2011_06_03-07_59.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:feed4ef7344055a36d655aacb5c44de5d9cc037ef122d35610df3b02adf88fbd
-size 168437668

macros.gap

@@ -0,0 +1,29 @@
+#
+# In noarch package, we can just move all the data - this is cheap.
+# For arch-dependent packages however, the source needs to reside at
+# its original position for debuginfo to be properly generated, and
+# thus we do a cp there instead.
+# The macro sets $gapmoddir.
+#
+%gappkg_simple_install() \
+	moddir="$(readlink -f .)"; \
+	if [ "%_target_cpu" = "noarch" ]; then \
+		moddir="%gap_sitelib/${moddir##*/}"; \
+		stopdir="%gap_sitelib_anchor"; \
+		mkdir -p "%buildroot/$moddir"; \
+		mv * "%buildroot/$moddir/"; \
+	else \
+		moddir="%gap_sitearch/${moddir##*/}"; \
+		stopdir="%gap_sitearch_anchor"; \
+		mkdir -p "%buildroot/$moddir"; \
+		cp -a * "%buildroot/$moddir/"; \
+	fi; \
+	echo "$moddir" >>"%name.files"; \
+	d="${moddir%/*}"; \
+	while [ -n "$d" -a "$d" != "/" -a "$d" != "$stopdir" ]; do \
+		echo "%%dir $d" >>"%name.files"; \
+		d="${d%/*}"; \
+	done; \
+	echo "%%dir $d" >>"%name.files"; \
+	unset d; \
+	unset stopdir;

sanitize_source.sh

@@ -0,0 +1,30 @@
+#!/bin/sh -ex
+
+set -ex;
+dir="gap4r6";
+dl=$(pcregrep -o "(?<=^#DL-URL:).*" gap.spec | head -n1 | perl -pe 's{^\s+}{}');
+dlbase="${dl##*/}";
+if [ ! -e "$dlbase" ]; then
+	wget -c "$dl";
+fi;
+rm -Rf "$dir";
+tar -xf "$dlbase";
+
+pushd "$dir/pkg/";
+rm -Rf *;
+popd;
+pushd "$dir/bin/";
+rm -f *.bat;
+popd;
+pushd "$dir/extern/";
+find . -type f ! -name "Makefile*" -print -delete;
+popd;
+
+if false; then
+	# no longer necessary?
+	find "$dir" -type f "(" \
+		-name "*~" -o -name "*.bak" -name .arch-ids \
+		")" -print -delete;
+fi;
+qtar gap-4.6.4.tar "$dir";
+xz -8fv gap-4.6.4.tar;