Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2017-08-18 15:06:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut" Fri Aug 18 15:06:56 2017 rev:57 rq:517542 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2017-08-12 20:28:53.561814988 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2017-08-18 15:07:00.312173250 +0200 @@ -1,0 +2,8 @@ +Fri Aug 18 08:21:49 UTC 2017 - [email protected] + +- Add use-pkg-config-gdlib.diff to fix a build failure due to the + configure scripts using gdlib-config (which is deprecated) to + obtain the CFLAGS/LDFLAGS/LIBS to use when building with gd. With + the patch, nut now uses pkg-config which returns the right values + +------------------------------------------------------------------- New: ---- use-pkg-config-gdlib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.fvwUA5/_old 2017-08-18 15:07:01.484008211 +0200 +++ /var/tmp/diff_new_pack.fvwUA5/_new 2017-08-18 15:07:01.488007648 +0200 @@ -78,6 +78,8 @@ Patch8: nut-doc-fixed-date.patch # PATCH-FIX-UPSTREAM nut-doc-cables.patch [email protected] -- Build HTML documentation of cables. Patch9: nut-doc-cables.patch +# PATCH-FIX-UPSTREAM use-pkg-config-gdlib.diff [email protected] -- Use pkg-config to obtain CFLAGS and LDFLAGS to use when building with gd +Patch10: use-pkg-config-gdlib.diff BuildRequires: apache2-devel BuildRequires: avahi-devel BuildRequires: dbus-1-glib-devel @@ -304,6 +306,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 sed -i s/@now@/`date -r ChangeLog +%%Y-%%m-%%d`/g docs/docinfo.xml.in sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init ++++++ use-pkg-config-gdlib.diff ++++++ Index: nut-2.7.4/m4/nut_check_libgd.m4 =================================================================== --- nut-2.7.4.orig/m4/nut_check_libgd.m4 +++ nut-2.7.4/m4/nut_check_libgd.m4 @@ -34,9 +34,9 @@ if test -z "${nut_have_libgd_seen}"; the AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]]) ;; *) - CFLAGS="`gdlib-config --includes 2>/dev/null`" - LDFLAGS="`gdlib-config --ldflags 2>/dev/null`" - LIBS="`gdlib-config --libs 2>/dev/null`" + CFLAGS="`pkg-config gdlib --cflags 2>/dev/null`" + LDFLAGS="`pkg-config gdlib --libs 2>/dev/null`" + LIBS="" ;; esac
