OBS User unknown 2008-07-08 23:56:54 +00:00 committed by Git OBS Bridge
parent 46f76f3e48
commit 2b84b058dd
5 changed files with 41 additions and 19 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Jul 7 15:13:24 CEST 2008 - mkoenig@suse.de
- update which to version 2.19
* Upgraded code from bash to version 3.2. This DOES has influence
on how Which behaves under certain circumstances.
* When the environment variable HOME is not set, the home directory
is now read from /etc/passwd or set to '/' if no home directory
could be found (this now matches the tilde lib used in bash)
* Changed the license to GPLv3
* Add support for shells that output '{' on the same line as the
function name in the output of 'declare -f' (ie zsh).
- fix build
-------------------------------------------------------------------
Wed Jul 2 15:47:08 CEST 2008 - mkoenig@suse.de

View File

@ -12,7 +12,7 @@
Name: util-linux
BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel ncurses-devel pam-devel zlib-devel
BuildRequires: audit-devel gettext-devel libuuid-devel libvolume_id-devel ncurses-devel pam-devel readline-devel zlib-devel
Url: http://kernel.org/pub/linux/utils/util-linux
Provides: util rawio raw base schedutils
Supplements: filesystem(minix)
@ -22,7 +22,7 @@ License: BSD 3-Clause; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 2.14
Release: 3
Release: 4
Requires: %name-lang = %{version}
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@ -35,7 +35,7 @@ Source6: etc_filesystems
Source7: v2.14-ChangeLog
Source8: v2.14-ReleaseNotes
%define time_ver 1.7
%define which_ver 2.16
%define which_ver 2.19
%define adjtimex_ver 1.20
Source9: adjtimex-%{adjtimex_ver}.tar.bz2
Source10: freeramdisk.tar.bz2
@ -139,7 +139,10 @@ make CFLAGS="$RPM_OPT_FLAGS" freeramdisk
cd ..
# which build
cd which-%{which_ver}
autoreconf -fi
#autoreconf -fi
aclocal --force
autoconf --force
automake --force-missing --add-missing --foreign
%{?suse_update_config:%{suse_update_config}}
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr \
--mandir=%{_mandir} \
@ -569,6 +572,17 @@ fi
#%endif
%changelog
* Mon Jul 07 2008 mkoenig@suse.de
- update which to version 2.19
* Upgraded code from bash to version 3.2. This DOES has influence
on how Which behaves under certain circumstances.
* When the environment variable HOME is not set, the home directory
is now read from /etc/passwd or set to '/' if no home directory
could be found (this now matches the tilde lib used in bash)
* Changed the license to GPLv3
* Add support for shells that output '{' on the same line as the
function name in the output of 'declare -f' (ie zsh).
- fix build
* Wed Jul 02 2008 mkoenig@suse.de
- replace util-linux-2.14-mount_ignore_ENXIO_in_del_loop.patch
with upstream version

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37db49d0f9b5364ac181fd151b8e272645341b73e08675e05031ef564ea539f3
size 100172

3
which-2.19.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0fb382412c553f05f1336a43591e7de106e9ca3c675113973160e72196001df6
size 105483

View File

@ -1,20 +1,14 @@
--- acinclude.m4
+++ acinclude.m4
@@ -3,21 +3,26 @@ dnl [, ACTION-IF-NOT-FOUND [, OTHER-L
dnl Like AC_CHECK_LIB but looking for static libraries.
dnl LIBRARY must be of the form libxxx.a.
dnl The current language must be C (AC_LANG_C).
-AC_DEFUN(AC_CHECK_STATICLIB,
+AC_DEFUN([AC_CHECK_STATICLIB],
[AC_MSG_CHECKING([for $2 in $1])
dnl Use a cache variable name containing both the library and function name,
dnl because the test really is for library $1 defining function $2, not
Index: acinclude.m4
===================================================================
--- acinclude.m4.orig 2006-02-02 05:06:43.000000000 +0100
+++ acinclude.m4 2008-07-07 14:14:59.000000000 +0200
@@ -10,14 +10,19 @@ dnl because the test really is for libra
dnl just for library $1. Separate tests with the same $1 and different $2s
dnl may have different results.
ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
-AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var,
+AC_CACHE_VAL(ac_cv_lib_static_$ac_lib_var, [
+if test "$libdir" != "${exec_prefix}/lib"; then
+if test "$libdir" != "${exec_prefix}/lib"; then
+ case $libdir in *64)
+ libsuffix=64
+ esac