diff --git a/procps.changes b/procps.changes index d8a9b45..b0e720f 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 10 07:32:20 UTC 2015 - werner@suse.de + +- Make it build with every ncurses library ABI + ------------------------------------------------------------------- Tue Jun 2 06:43:46 UTC 2015 - werner@suse.de diff --git a/procps.spec b/procps.spec index 5aeacbe..bdaaaf7 100644 --- a/procps.spec +++ b/procps.spec @@ -1,7 +1,7 @@ # # spec file for package procps # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,8 +149,9 @@ tar --strip-components=1 -xf %{S:1} test -s .tarball-version || echo %{version} > .tarball-version #./autogen.sh autoreconf -export NCURSESW_CFLAGS="$(ncursesw5-config --cflags)" -export NCURSESW_LIBS="$(ncursesw5-config --libs)" +major=$(sed -rn 's/^#define\s+NCURSES_VERSION_MAJOR\s+([0-9]+)/\1/p' /usr/include/ncurses.h) +export NCURSESW_CFLAGS="$(ncursesw${major}-config --cflags)" +export NCURSESW_LIBS="$(ncursesw${major}-config --libs)" export LFS_CFLAGS="$(getconf LFS_CFLAGS)" %global optflags %{optflags} -D_GNU_SOURCE $LFS_CFLAGS -DCPU_ZEROTICS -DUSE_X_COLHDR -pipe %configure \