Two patches attached.

Unfortunately to use this you need to expand out %base-services to add
upower to the udev-service form.  Also you need the upower-service,
obviously, and upower needs to be added to the dbus-service form as
well.