Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nut for openSUSE:Factory checked in
at 2021-01-18 11:29:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nut (Old)
and /work/SRC/openSUSE:Factory/.nut.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut"
Mon Jan 18 11:29:36 2021 rev:68 rq:863888 version:2.7.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/nut/nut.changes 2020-05-15 23:51:49.533487366
+0200
+++ /work/SRC/openSUSE:Factory/.nut.new.28504/nut.changes 2021-01-18
11:33:40.168970394 +0100
@@ -1,0 +2,6 @@
+Mon Dec 21 21:34:16 UTC 2020 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- use pkg-config to determine version of libgd
+- use apache-rpm-macros
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nut.spec ++++++
--- /var/tmp/diff_new_pack.ZaUooL/_old 2021-01-18 11:33:40.944971762 +0100
+++ /var/tmp/diff_new_pack.ZaUooL/_new 2021-01-18 11:33:40.944971762 +0100
@@ -16,7 +16,6 @@
#
-%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null ||
%{_sbindir}/apxs -q PREFIX)
%define CGIPATH %{apache_serverroot}/cgi-bin
%define HTMLPATH %{apache_serverroot}/htdocs
%define MODELPATH %{_libexecdir}/ups/driver
@@ -60,7 +59,7 @@
Patch12: nut-upssched.patch
Patch13: reproducible.patch
Patch14: nutscanner-ftbfs.patch
-BuildRequires: apache2-devel
+BuildRequires: apache-rpm-macros
BuildRequires: asciidoc
BuildRequires: avahi-devel
BuildRequires: fdupes
++++++ use-pkg-config-gdlib.diff ++++++
--- /var/tmp/diff_new_pack.ZaUooL/_old 2021-01-18 11:33:41.068971981 +0100
+++ /var/tmp/diff_new_pack.ZaUooL/_new 2021-01-18 11:33:41.072971988 +0100
@@ -2,6 +2,17 @@
===================================================================
--- nut-2.7.4.orig/m4/nut_check_libgd.m4
+++ nut-2.7.4/m4/nut_check_libgd.m4
+@@ -19,8 +19,8 @@ if test -z "${nut_have_libgd_seen}"; the
+ LDFLAGS="-L/usr/X11R6/lib"
+ LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+
+- AC_MSG_CHECKING(for gd version via gdlib-config)
+- GD_VERSION=`gdlib-config --version 2>/dev/null`
++ AC_MSG_CHECKING(for gd version via pkg-config)
++ GD_VERSION=`pkg-config --modversion gdlib 2>/dev/null`
+ if test "$?" != "0" -o -z "${GD_VERSION}"; then
+ GD_VERSION="none"
+ fi
@@ -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]])
;;
