OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nut?expand=0&rev=20

nut.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  2 14:38:25 CET 2009 - sbrabec@suse.cz
+
+- Removed obsolete dbus configuration for powersave (bnc#468391).
+
 -------------------------------------------------------------------
 Wed Jan 28 15:51:40 CET 2009 - crrodriguez@suse.de
 

nut.spec

@@ -28,13 +28,12 @@ Obsoletes:      smartups
 Conflicts:      apcupsd
 Summary:        Network UPS Tools Core (Unbreakable Power Supply Monitoring)
 Version:        2.2.2
-Release:        68
+Release:        70
 Url:            http://www.networkupstools.org/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        upsd.init
 Source2:        README.SUSE
 Source3:        upsd-early-powerdown.init
-Source4:        upsd.dbus-1
 Source5:        nut.firewall.in
 Source6:        nut-disable-hal-hid-ups.fdi
 Source7:        nut.sleep
@@ -469,7 +468,7 @@ Authors:
 
 %prep
 %setup -q
-cp -a %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:7} .
+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
@@ -522,8 +521,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m 755 upsd.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/upsd
 ln -sf ../..%{_sysconfdir}/init.d/upsd $RPM_BUILD_ROOT%{_sbindir}/rcupsd
 mkdir -p $RPM_BUILD_ROOT%{STATEPATH}
+%if %suse_version < 1110
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
-install -m 644 upsd.dbus-1 $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/upsd.conf
+install -m 644 packaging/opensuse/upsd.dbus-1 $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/upsd.conf
+%endif
 rename .sample "" $RPM_BUILD_ROOT%{_sysconfdir}/ups/*.sample
 %if %suse_version >= 1030
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
@@ -670,7 +671,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/pm/sleep.d/99nut
 %endif
 %{_sbindir}/*
+%if %suse_version < 1110
 %{_sysconfdir}/dbus-1/system.d/upsd.conf
+%endif
 %if %suse_version >= 1030
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut
 %endif
@@ -699,6 +702,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*.*
 
 %changelog
+* Mon Feb 02 2009 sbrabec@suse.cz
+- Removed obsolete dbus configuration for powersave (bnc#468391).
 * Wed Jan 28 2009 crrodriguez@suse.de
 - remove static libraries and "la" files
 - add missing openssl-devel to Requires of -devel package

upsd.dbus-1

@@ -1,9 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Allow user upsd to send powersave-notify messages -->
-  <policy user="upsd">
-    <allow send_interface="com.novell.powersave.scripts"/>
-  </policy>
-</busconfig>