Hello community,
here is the log from the commit of package nut for openSUSE:Factory
checked in at Thu Jul 30 16:49:53 CEST 2009.
--------
--- nut/nut.changes 2009-02-02 14:38:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/nut/nut.changes 2009-07-14 10:03:56.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 14 10:03:39 CEST 2009 - coolo@novell.com
+
+- fix hal directories
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nut.spec ++++++
--- /var/tmp/diff_new_pack.HFo0I5/_old 2009-07-30 16:37:27.000000000 +0200
+++ /var/tmp/diff_new_pack.HFo0I5/_new 2009-07-30 16:37:27.000000000 +0200
@@ -28,7 +28,7 @@
Conflicts: apcupsd
Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring)
Version: 2.2.2
-Release: 70
+Release: 71
Url: http://www.networkupstools.org/
Source: %{name}-%{version}.tar.bz2
Source1: upsd.init
@@ -75,42 +75,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package drivers-net
License: GPL v2 or later
Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring)
@@ -130,42 +94,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package -n libupsclient1
License: GPL v2 or later
Summary: Network UPS Tools Library (Unbreakable Power Supply Monitoring)
@@ -180,42 +108,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package classic
License: GPL v2 or later
Summary: Network UPS Tools Classic Package (Monitoring Server)
@@ -260,42 +152,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package hal
License: GPL v2 or later
Summary: Network UPS Tools Support for HAL (HAL/D-BUS Integration)
@@ -324,42 +180,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package cgi
License: GPL v2 or later
Summary: Network UPS Tools Web Server Support (UPS Status Pages)
@@ -381,42 +201,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%package devel
License: GPL v2 or later
Summary: Network UPS Tools (Unbreakable Power Supply Monitoring)
@@ -430,42 +214,6 @@
Detailed information about supported hardware can be found in
/usr/share/doc/packages/nut.
-
-
-Authors:
---------
- Arnaud Quette
- Russell Kroll
- Stephen Brown
- Bill Carlson
- Ben Collver
- Luca Filipozzi
- Matthew Gabeler-Lee
- Bruno Hall
- Bo Kersey - VirCIO - Managed Server Solutions
- Rick Lyons
- Jeremy Maccelari
- Philippe Marzouk
- Theodor A. Milkov
- Mark Powell
- Lars Balker Rasmussen
- Carlos Rodrigues
- David Santinoli
- Peter Selinger
- Kirill Smelkov
- John Stone
- Technorama Ltd.
- Jason Thomas
- Simon Rozman
- Len J White
- Walt Holman
- Fabio Di Niro
- Arjen de Korte
- H�vard Lygre
- Niels Baggesen
- Niklas Edmundsson
- Olli Savia
-
%prep
%setup -q
cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} .
@@ -492,7 +240,7 @@
%build
autoreconf -f -i
-%configure --disable-static --with-pic\
+%configure --disable-static --with-pic --libexecdir=%_prefix/lib \
--sysconfdir=%{CONFPATH}\
--datadir=%{_datadir}/nut\
--with-all\
@@ -692,7 +440,7 @@
%files hal
%defattr(-,root,root)
%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
-%{_libdir}/hal/*
+%{_prefix}/lib/hal/*
%files devel
%defattr(-,root,root)
++++++ nut-hal.patch ++++++
--- /var/tmp/diff_new_pack.HFo0I5/_old 2009-07-30 16:37:28.000000000 +0200
+++ /var/tmp/diff_new_pack.HFo0I5/_new 2009-07-30 16:37:28.000000000 +0200
@@ -9,3 +9,25 @@
<!-- MGE UPS SYSTEMS -->
<match key="usb_device.vendor_id" int="0x0463">
+--- configure
++++ configure
+@@ -9738,7 +9738,7 @@ echo $ECHO_N "checking for libhal Callou
+ if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal")
+ then
+ # For Debian
+- HAL_CALLOUTS_PATH="${libdir}/hal"
++ HAL_CALLOUTS_PATH="${prefix}/lib/hal"
+ { echo "$as_me:$LINENO: result: ${HAL_CALLOUTS_PATH}" >&5
+ echo "${ECHO_T}${HAL_CALLOUTS_PATH}" >&6; }
+ else # For RedHat
+--- m4/nut_check_libhal.m4
++++ m4/nut_check_libhal.m4
+@@ -66,7 +66,7 @@ if test -z "${nut_have_libhal_seen}"; th
+ if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal")
+ then
+ # For Debian
+- HAL_CALLOUTS_PATH="${libdir}/hal"
++ HAL_CALLOUTS_PATH="${prefix}/lib/hal"
+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
+ else # For RedHat
+ if (test -d "/usr/libexec")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org