diff --git a/util-linux.changes b/util-linux.changes index b1e3039..747c987 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 31 10:04:23 UTC 2012 - sweet_f_a@gmx.de + +- require binutils-devel because "which" wants to find libiberty.a +- remove which-lib64.patch because it's broken and couldn't find + libiberty.a whithin /usr/lib64 +- which doesn't need autoreconf anymore + ------------------------------------------------------------------- Tue May 29 09:28:55 UTC 2012 - puzel@suse.com diff --git a/util-linux.spec b/util-linux.spec index 48fdd6a..21ab64b 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -22,6 +22,7 @@ Name: util-linux BuildRequires: audit-devel +BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: libselinux-devel @@ -100,10 +101,6 @@ Patch56: klogconsole.diff ## time ## Patch60: time-1.7.dif -## -## which -## -Patch70: which-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -207,8 +204,6 @@ cd ../klogconsole %patch56 -p1 cd ../time-* %patch60 -cd ../which-* -%patch70 %build # adjtimex build @@ -219,9 +214,6 @@ cd .. pushd ../ # which build cd which-%{which_ver} -aclocal --force -autoconf --force -automake --force-missing --add-missing --foreign %configure make %{?_smp_mflags} cd .. diff --git a/which-lib64.patch b/which-lib64.patch deleted file mode 100644 index 0e03a29..0000000 --- a/which-lib64.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -+ case $libdir in *64) -+ libsuffix=64 -+ esac -+fi - if test -r /etc/ld.so.conf ; then -- ld_so_paths="/lib /usr/lib `cat /etc/ld.so.conf`" -+ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix} `cat /etc/ld.so.conf`" - else -- ld_so_paths="/lib /usr/lib" -+ ld_so_paths="/lib${libsuffix} /usr/lib${libsuffix}" - fi - for path in $ld_so_paths; do -- [ac_save_LIBS="$LIBS" -+ ac_save_LIBS="$LIBS" - LIBS="$path/$1 $5 $LIBS" - AC_TRY_LINK(dnl - ifelse([$2], [main], , dnl Avoid conflicting decl of main.