diff --git a/nut-hal.patch b/nut-hal.patch deleted file mode 100644 index bdad002..0000000 --- a/nut-hal.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: nut-2.6.0/m4/nut_config_libhal.m4 -=================================================================== ---- nut-2.6.0.orig/m4/nut_config_libhal.m4 -+++ nut-2.6.0/m4/nut_config_libhal.m4 -@@ -71,7 +71,11 @@ if test -z "${nut_have_config_libhal_see - dnl As per HAL spec, ยง5 Callouts addon install path: $libdir/hal - HAL_CALLOUTS_PATH="`pkg-config --silence-errors --variable=libexecdir hal 2>/dev/null`" - if test "$?" != "0" -o -z "${HAL_CALLOUTS_PATH}"; then -- HAL_CALLOUTS_PATH="${libdir}/hal" -+ if test -d "${prefix}/lib/hal"; then -+ HAL_CALLOUTS_PATH="${prefix}/lib/hal" -+ else -+ HAL_CALLOUTS_PATH="${libdir}/hal" -+ fi - fi - ]) - AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) diff --git a/nut.changes b/nut.changes index 49f2530..d8a683b 100644 --- a/nut.changes +++ b/nut.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- -Wed Feb 9 15:21:54 CET 2011 - sbrabec@suse.cz +Wed Feb 9 13:59:06 CET 2011 - sbrabec@suse.cz -- Do not force move hal addons - fix configure check instead - - different SUSE versions need different path. +- Do not force move hal addons - configure check does it correctly. ------------------------------------------------------------------- Tue Feb 8 10:16:54 UTC 2011 - coolo@novell.com diff --git a/nut.spec b/nut.spec index f2fa210..536e9d9 100644 --- a/nut.spec +++ b/nut.spec @@ -1,7 +1,7 @@ # -# spec file for package nut +# spec file for package nut (Version 2.6.0) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,11 +23,11 @@ BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libo BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix -License: GPLv2+ +License: GPL v2 or later Group: Hardware/UPS Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.6.0 -Release: 6 +Release: 1 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -37,8 +37,6 @@ Source5: nut.firewall.in Source6: nut-disable-hal-hid-ups.fdi Source7: nut.sleep Patch: nut-preconfig.patch -# PATCH-FIX-OPENSUSE nut-hal.patch sbrabec@suse.cz -- Fix hal callouts path. -Patch1: nut-hal.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch @@ -78,7 +76,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package drivers-net -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS Requires: %{name}-classic = %{version} @@ -97,7 +95,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package -n libupsclient1 -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools Library (Unbreakable Power Supply Monitoring) Group: System/Libraries @@ -111,7 +109,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package classic -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools Classic Package (Monitoring Server) Group: Hardware/UPS Requires: %{name} = %{version} @@ -155,7 +153,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package hal -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools Support for HAL (HAL/D-BUS Integration) Group: Hardware/UPS Requires: %{name} = %{version} @@ -183,7 +181,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package cgi -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS Requires: %{name}-classic = %{version} @@ -204,7 +202,7 @@ Detailed information about supported hardware can be found in /usr/share/doc/packages/nut. %package devel -License: GPLv2+ +License: GPL v2 or later Summary: Network UPS Tools (Unbreakable Power Supply Monitoring) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} openssl-devel @@ -222,7 +220,6 @@ cp -a %{S:1} %{S:2} %{S:3} %{S:5} %{S:7} . cp -a %{S:6} 20-nut-disable-hal-hid-ups.fdi mv upsd-early-powerdown.init upsd-early-powerdown %patch -%patch1 -p1 %patch3 %if %suse_version < 1110 %patch4