OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jan-2007 21:00:14
Branch: HEAD Handle: 2007010520001201
Added files:
openpkg-src/bzip2 bzip2.patch
Modified files:
openpkg-src/bzip2 bzip2.spec
Log:
mktemp is too unportable, so provide a fallback solution for
portability
Summary:
Revision Changes Path
1.2 +19 -0 openpkg-src/bzip2/bzip2.patch
1.38 +2 -0 openpkg-src/bzip2/bzip2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bzip2/bzip2.patch
============================================================================
$ cvs diff -u -r0 -r1.2 bzip2.patch
--- /dev/null 2007-01-05 21:00:13 +0100
+++ bzip2.patch 2007-01-05 21:00:14 +0100
@@ -0,0 +1,19 @@
+Index: bzdiff
+--- bzdiff.orig 2007-01-05 20:55:31 +0100
++++ bzdiff 2007-01-05 20:57:56 +0100
+@@ -37,10 +37,15 @@
+ echo "Usage: $prog [${comp}_options] file [file]"
+ exit 1
+ fi
++if type mktemp >/dev/null 2>&1; then
+ tmp=`mktemp ${TMPDIR:-/tmp}/bzdiff.XXXXXXXXXX` || {
+ echo 'cannot create a temporary file' >&2
+ exit 1
+ }
++else
++ set -C
++ tmp=${TMPDIR-/tmp}/bzdiff.$$
++fi
+ set $FILES
+ if test $# -eq 1; then
+ FILE=`echo "$1" | sed 's/.bz2$//'`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/bzip2/bzip2.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 bzip2.spec
--- openpkg-src/bzip2/bzip2.spec 5 Jan 2007 19:52:34 -0000 1.37
+++ openpkg-src/bzip2/bzip2.spec 5 Jan 2007 20:00:13 -0000 1.38
@@ -37,6 +37,7 @@
# list of sources
Source0: http://www.bzip.org/%{version}/bzip2-%{version}.tar.gz
+Patch0: bzip2.patch
# build information
Prefix: %{l_prefix}
@@ -62,6 +63,7 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst \
-e 's;#!/bin/sh;#!%{l_bash};g' \
-e 's;^\(PATH="\)\(.*\)$;\1%{l_prefix}/bin:\2;' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
