SPECS (AC-branch): nut.spec - BR: X11-devel, added ugly sed hack t...

[hawk]

Author: hawk                         Date: Sun Nov 18 22:24:21 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- BR: X11-devel, added ugly sed hack to fix gd LDFLAGS guessing
- really release 2

---- Files affected:
SPECS:
   nut.spec (1.139.2.1 -> 1.139.2.2) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.139.2.1 SPECS/nut.spec:1.139.2.2
--- SPECS/nut.spec:1.139.2.1	Sun Nov 18 21:53:12 2007
+++ SPECS/nut.spec	Sun Nov 18 23:24:16 2007
@@ -7,7 +7,7 @@
 #
 # Conditional build:
 %bcond_without	usb			# build without usb drivers
-%bcond_without	hal			# build without hal support
+%bcond_with	hal			# build without hal support
 %bcond_without	snmp			# build without snmp driver
 %bcond_without	cgi			# build without cgi support
 #
@@ -15,7 +15,7 @@
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.2.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://eu1.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@
 Patch2:		%{name}-smartdp-load.patch
 Patch3:		%{name}-upssched-cmd-sysconf.patch
 URL:		http://www.networkupstools.org/
+BuildRequires:	X11-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_hal:BuildRequires:	dbus-glib-devel}
@@ -175,6 +176,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+sed -i -e 's!`gdlib-config --ldflags`!-L/usr/X11R6/%{_lib} `gdlib-config --ldflags`!g' m4/nut_check_libgd.m4
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -432,6 +434,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.139.2.2  2007-11-18 22:24:16  hawk
+- BR: X11-devel, added ugly sed hack to fix gd LDFLAGS guessing
+- really release 2
+
 Revision 1.139.2.1  2007-11-18 20:53:12  hawk
 - reverted strict hal BR for Ac
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nut.spec?r1=1.139.2.1&r2=1.139.2.2&f=u