From 100cdf58752700073f56319751e4be079fdcfac531c9858a90993e113e37e72b Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 24 May 2013 12:50:15 +0000
Subject: [PATCH] Use upstream's stripped archive instead of doing it ourselves

OBS-URL: https://build.opensuse.org/package/show/science/gap?expand=0&rev=9
---
 gap-4.6.4.tar.xz        |  3 ---
 gap.spec                | 16 +++++++++-------
 gap4r6p4_nopackages.zip |  3 +++
 sanitize_source.sh      | 30 ------------------------------
 4 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 gap-4.6.4.tar.xz
 create mode 100644 gap4r6p4_nopackages.zip
 delete mode 100644 sanitize_source.sh

diff --git a/gap-4.6.4.tar.xz b/gap-4.6.4.tar.xz
deleted file mode 100644
index 328c8c8..0000000
--- a/gap-4.6.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a3848a2f910a3d5b4b294a98ec4ba00b7e67ca2a904424d2acc12d385882801
-size 36431408
diff --git a/gap.spec b/gap.spec
index 0b3b88b..d8f754d 100644
--- a/gap.spec
+++ b/gap.spec
@@ -24,13 +24,11 @@ License:        GPL-2.0+
 Group:          Productivity/Scientific/Math
 Url:            http://gap-system.org/
 
-#DL-URL:	ftp://ftp.gap-system.org/pub/gap/gap4/tar.gz/gap4r6p4_2013_05_04-16_36.tar.gz
-Source:         gap-4.6.4.tar.xz
+Source:		ftp://ftp.gap-system.org/pub/gap/gap4core/gap4r6p4_nopackages.zip
 Source2:        %name-rpmlintrc
-Source3:        sanitize_source.sh
 Patch1:         gap-final-dir.diff
 Patch2:         gap-multiarch.diff
-Patch5:         gap-ttyname-null.diff
+Patch3:         gap-ttyname-null.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
 BuildRequires:  fdupes
@@ -39,7 +37,7 @@ BuildRequires:  gmp-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 BuildRequires:  readline-devel
-BuildRequires:  xz
+BuildRequires:  unzip
 %if 0%{?suse_version}
 BuildRequires:  fastjar
 %endif
@@ -303,9 +301,13 @@ This subpackage contains the database of transitive groups.
 
 %prep
 %setup -qn gap4r6
-%patch -P 1 -P 2 -P 5 -p1
+%patch -P 1 -P 2 -P 3 -p1
 
 %build
+rm -f bin/*.bat
+pushd extern/
+find . -type f ! -name "Makefile*" -print -delete
+popd
 pushd cnf/
 make
 popd
@@ -353,7 +355,7 @@ ln -s "%_docdir/%name" "doc";
 
 # Move data into FHS
 rm -f tst/remake.sh doc/test/re;
-mkdir -p "$b/%gapdatadir/pkg";
+mkdir -p "$b/%gapdatadir/pkg" "$b/%gapdir/pkg";
 dirs="grp lib prim small trans tst";
 mv $dirs "$b/%gapdatadir";
 for i in $dirs; do
diff --git a/gap4r6p4_nopackages.zip b/gap4r6p4_nopackages.zip
new file mode 100644
index 0000000..eb6cfe8
--- /dev/null
+++ b/gap4r6p4_nopackages.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f89d10709b220e537f8937736627e32948ed98d17a91e482e1c7e6d714566c59
+size 42178117
diff --git a/sanitize_source.sh b/sanitize_source.sh
deleted file mode 100644
index a68e83e..0000000
--- a/sanitize_source.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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;