Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Wed Apr 20 14:02:11 CEST 2011.
-------- --- nut/nut.changes 2011-02-08 11:17:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/nut/nut.changes 2011-02-09 15:22:57.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 9 15:21:54 CET 2011 - [email protected] + +- Do not force move hal addons - fix configure check instead - + different SUSE versions need different path. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nut-hal.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.TI1idJ/_old 2011-04-20 14:01:10.000000000 +0200 +++ /var/tmp/diff_new_pack.TI1idJ/_new 2011-04-20 14:01:10.000000000 +0200 @@ -27,7 +27,7 @@ Group: Hardware/UPS Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.6.0 -Release: 1 +Release: 6 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -37,6 +37,8 @@ Source6: nut-disable-hal-hid-ups.fdi Source7: nut.sleep Patch: nut-preconfig.patch +# PATCH-FIX-OPENSUSE nut-hal.patch [email protected] -- Fix hal callouts path. +Patch1: nut-hal.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch @@ -220,6 +222,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 @@ -295,9 +298,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/hal -mv $RPM_BUILD_ROOT/%{_prefix}/lib64/hal/hald-addon-* $RPM_BUILD_ROOT/%{_prefix}/lib/hal || true - %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : @@ -445,7 +445,11 @@ %files hal %defattr(-,root,root) %{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi +%if %suse_version < 1120 +%{_libdir}/hal/* +%else %{_prefix}/lib/hal/* +%endif %files devel %defattr(-,root,root) ++++++ nut-hal.patch ++++++ 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}) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
