pick: Update from 2.0.1 to 2.0.2
[termux-packages] / disabled-packages / checkinstall / checkinstall.patch
CommitLineData
c6d716cc
FF
1diff -u -r ../checkinstall-1.6.2/checkinstall ./checkinstall
2--- ../checkinstall-1.6.2/checkinstall 2009-12-26 14:17:24.000000000 -0500
3+++ ./checkinstall 2016-10-28 16:32:12.759574819 -0400
4@@ -492,7 +492,7 @@
5 ckversion
6 echo
7
8-CHECKINSTALLRC=${CHECKINSTALLRC:-${INSTALLDIR}/checkinstallrc}
9+CHECKINSTALLRC=${CHECKINSTALLRC:-${INSTALLDIR}/lib/checkinstall/checkinstallrc}
10 if ! [ -f $CHECKINSTALLRC ]; then
11 echog "The checkinstallrc file was not found at:\n$CHECKINSTALLRC"
12 echo
13@@ -974,7 +974,7 @@
14 ! [ "$INSTALL" ] && INSTALL=0
15
16 # The place where we will be storing the temp files
17-! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=/var/tmp
18+! [ "$BASE_TMP_DIR" ] && BASE_TMP_DIR=/data/data/com.termux/files/usr/tmp
19
20 # Default RPM FLAGS
21 ! [ "$RPM_FLAGS" ] && RPM_FLAGS=" --force --nodeps --replacepkgs "
22@@ -1249,7 +1249,7 @@
23 # Fix the PowerPC & Amd64 architecture description if we're on Debian
24
25 if [ "$CK_DEBIAN" = "1" ] ; then
26- ARCHITECTURE=`dpkg-architecture -qDEB_HOST_ARCH`
27+ ARCHITECTURE=`dpkg --print-architecture`
28 fi
29 fi
30
31@@ -1508,7 +1508,7 @@
32 TMP_SCRIPT=${TMP_DIR}/installscript.sh
33
34 cat << EOF > $TMP_SCRIPT
35-#!/bin/sh
36+#!@TERMUX_PREFIX@/bin/sh
37
38 cd "$DIRECTORIO_FUENTE"
39 EOF
40@@ -1538,7 +1538,7 @@
41 # installwatch excludes itself some directories, but we put them all here,
42 # to be explicit.
43 #
44-IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp"
45+IEXCLUDE="${DIRECTORIO_FUENTE},/dev,/proc,/tmp,/var/tmp,/data/data/com.termux/files/usr/tmp"
46
47
48 # Run the install command, showing the results interactively if we were asked