|
|
@@ -39,7 +39,7 @@
|
|
|
# o any cc(1)
|
|
|
|
|
|
# the package version/release
|
|
|
-%define V_openpkg 20040405
|
|
|
+%define V_openpkg 20040406
|
|
|
|
|
|
# the used software versions
|
|
|
%define V_rpm 4.2.1
|
|
|
@@ -50,7 +50,7 @@
|
|
|
%define V_make 3.80
|
|
|
%define V_gzip 1.3.5
|
|
|
%define V_patch 2.5.9
|
|
|
-%define V_tar 1.13.25
|
|
|
+%define V_tar 1.13.94
|
|
|
%define V_bash 2.05b
|
|
|
%define V_uuid 1.0.0
|
|
|
|
|
|
@@ -133,6 +133,7 @@ Source61: install.sh
|
|
|
Source62: man.sh
|
|
|
Source63: uuid.pod
|
|
|
Source64: uuid.8
|
|
|
+Source65: tar.patch
|
|
|
|
|
|
# build information
|
|
|
Prefix: %{l_prefix}
|
|
|
@@ -206,7 +207,7 @@ Provides: openpkg = 2.0.1-2.0.1
|
|
|
prog openpkg:tar = {
|
|
|
version = %{V_tar}
|
|
|
url = ftp://alpha.gnu.org/gnu/tar/
|
|
|
- regex = tar-(\d+\.\d+\d\.(2\d|9[4-9]))\.tar\.gz
|
|
|
+ regex = tar-(__VER__)\.tar\.gz
|
|
|
}
|
|
|
prog openpkg:zlib = {
|
|
|
version = %{V_zlib}
|
|
|
@@ -488,6 +489,9 @@ Provides: openpkg = 2.0.1-2.0.1
|
|
|
( cd bash-%{V_bash}
|
|
|
${l_patch} -p0 <`SOURCE bash.patch`
|
|
|
) || exit $?
|
|
|
+ ( cd tar-%{V_tar}
|
|
|
+ ${l_patch} -p0 <`SOURCE tar.patch`
|
|
|
+ ) || exit $?
|
|
|
( cd beecrypt-%{V_beecrypt}
|
|
|
${l_patch} -p0 <`SOURCE beecrypt.patch`
|
|
|
) || exit $?
|
|
|
@@ -556,10 +560,10 @@ Provides: openpkg = 2.0.1-2.0.1
|
|
|
sh $shtool subst \
|
|
|
-e 's;^rm conftest\.sed;rm -f conftest.sed;' \
|
|
|
configure
|
|
|
- CC="${l_cc}"
|
|
|
+ CC="${l_cc}" \
|
|
|
../bash-%{V_bash}/bash \
|
|
|
./configure \
|
|
|
- --config-cache \
|
|
|
+ --cache-file=./config.cache \
|
|
|
--prefix=%{l_prefix} \
|
|
|
--disable-nls
|
|
|
${l_make} || exit $?
|