Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 732b4e1

Browse files
author
Release Manager
committed
Trac #29521: Modify giac upstream tarball to remove non-portable filenames
http://www-fourier.ujf- grenoble.fr/~parisse/debian/dists/stable/main/source/ When preparing the reduced tarball with `spkg-src`, we should rename the non-portable file names with a colon in them: {{{ $ find . -name "*:*" ./doc/pari/Programming_in_GP:_control_statements.html ./doc/pari/Programming_in_GP:_other_specific_functions.html ./doc/pari/cont_Programming_in_GP:_other_specific_functions.html ./doc/pari/cont_Programming_in_GP:_control_statements.html }}} (problematic at least on Windows - as reported in #28549.) Previous updates: - #26315 Upgrade to Giac 1.5 - #28101 update giac to 1.5.0-63 Follow-up: #29552 (Upgrade giac to 1.5.0-87) ... for Sage 9.2 URL: https://trac.sagemath.org/29521 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): François Bissey, Dima Pasechnik
2 parents 984a111 + a9b4666 commit 732b4e1

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

build/pkgs/giac/checksums.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=giac-VERSION.tar.bz2
2-
sha1=7ea2f353b7f63f484d38fe86c5720c82d770c69c
3-
md5=652634cf95590a5601d17c90c3fc410c
4-
cksum=2772110213
2+
sha1=eadeb7194b1809298a0d94642d94c8dff80bbe3d
3+
md5=7760e342f5e5b3f5da0f1b9c15546b96
4+
cksum=1678878999
5+
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/29521/giac-1.5.0.63-p0.tar.bz2
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0.63.p0
1+
1.5.0.63-p0

build/pkgs/giac/spkg-src

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ set -e
1515

1616
VERSION="1.5.0"
1717
VERSIONREV="63"
18+
PATCHSUFFIX="-p0"
1819

1920
# The upstream tarball name is: giac"$SOURCEORIG".tar.gz
2021
SOURCEORIG=_"$VERSION"-"$VERSIONREV"
2122

2223
# The name of the output file without tar.gz or tar.bz2 extension
23-
OUTPUTFILEBASENAME="$SAGE_DISTFILES"/giac-"$VERSION"."$VERSIONREV"
24+
OUTPUTFILEBASENAME="$SAGE_DISTFILES"/giac-"$VERSION"."$VERSIONREV""$PATCHSUFFIX"
2425

2526
# Testing if the output file already exist in one of gz or bz2 format:
2627
if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; then
2728
echo >&2 "there is already a giac archive of this version"
2829
exit 1
2930
fi
3031

31-
# Build a temporary working dir. (subdir of SAGE_DISTFILES)
32-
TARGET=$(mktemp -d -p"$SAGE_DISTFILES")
32+
# Build a temporary working dir. (preferably, a subdir of SAGE_DISTFILES)
33+
TARGET=$(mktemp -d -p"$SAGE_DISTFILES" || mktemp -d)
3334
ORIGDIR=`pwd`
3435
cd "$TARGET"
3536

@@ -44,6 +45,9 @@ tar -xzf giac"$SOURCEORIG".tar.gz
4445
# rename top sourcedir
4546
mv giac-"$VERSION" src
4647

48+
# remove unnecessary files
49+
rm -rf src/doc/pari/*.html
50+
4751
# removing french html doc, but keep keywords, and working makefiles.
4852
# NB: the french html doc is huge and not GPL.
4953
# it is freely redistributable only for non commercial purposes.
@@ -66,9 +70,7 @@ touch html_vall
6670

6771
# building giac source tarball for the spkg
6872
cd ../../../
69-
tar -cj src -f "$OUTPUTFILEBASENAME".tar.bz2
70-
71-
73+
tar -cjf "$OUTPUTFILEBASENAME".tar.bz2 src
7274

7375
# cleaning extracted dir.
7476
cd ..

0 commit comments

Comments
 (0)