Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.173
diff -u -p -r1.173 gnome-power-manager.spec
--- gnome-power-manager.spec	24 Aug 2009 10:41:03 -0000	1.173
+++ gnome-power-manager.spec	29 Aug 2009 22:07:45 -0000
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.27.91
-Release: 1%{?dist}
+Release: 3%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -31,20 +31,16 @@ BuildRequires: unique-devel
 BuildRequires: DeviceKit-devel >= 002
 BuildRequires: DeviceKit-power-devel >= 008
 BuildRequires: intltool
-Requires: gtk2 >= 2.10.0
-Requires: gnome-icon-theme
 Requires: libnotify >= 0.4.3
 Requires: libcanberra
 Requires: hal >= %{hal_version}
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
-Requires: unique >= 0.9.4
 Requires: DeviceKit-power >= 008
-Requires(post): scrollkeeper
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
-Requires(postun): scrollkeeper
+Obsoletes: %{name} <= 2.27.91-1
 
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
@@ -52,6 +48,21 @@ displaying icons and handling user callb
 GNOME Power Preferences allows authorised users to set policy and
 change preferences.
 
+%package applets
+Summary: GNOME Power Manager panel applets
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Obsoletes: %{name} <= 2.27.91-1
+Requires: gtk2 >= 2.10.0
+Requires: gnome-icon-theme
+Requires: unique >= 0.9.4
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
+
+%description applets
+Panel applets and preferences application for the power management daemon,
+only needed for the GNOME desktop.
+
 %package extra
 Summary: GNOME Power Manager extra utility programs
 Group: Applications/System
@@ -117,11 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas >/dev/null || :
-scrollkeeper-update -q &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -137,31 +143,41 @@ if [ "$1" -eq 0 ]; then
       %{_sysconfdir}/gconf/schemas/gnome-power-manager.schemas > /dev/null || :
 fi
 
-%postun
+%post applets
+scrollkeeper-update -q &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%postun applets
 scrollkeeper-update -q &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
     gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%files -f %{name}.lang
+
+%files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
 %{_bindir}/gnome-power-bugreport.sh
 %{_bindir}/gnome-power-manager
-%{_bindir}/gnome-power-preferences
 %dir %{_datadir}/gnome-power-manager
-%{_datadir}/gnome-power-manager/gpm-prefs.ui
-%{_datadir}/gnome-power-manager/gpm-feedback-widget.ui
 %{_mandir}/man1/gnome-power-manager.1.gz
-%{_mandir}/man1/gnome-power-preferences.1.gz
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/dbus-1/services/gnome-power-manager.service
+
+%files applets -f %{name}.lang
+%{_bindir}/gnome-power-preferences
+%{_mandir}/man1/gnome-power-preferences.1.gz
 %{_datadir}/omf/gnome-power-manager
+%{_datadir}/applications/gnome-power-preferences.desktop
+%{_datadir}/gnome-power-manager/gpm-prefs.ui
+%{_datadir}/gnome-power-manager/gpm-feedback-widget.ui
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/gnome-power-manager/icons/hicolor/*/*/*.*
 %{_datadir}/icons/hicolor/*/apps/gnome-power-manager.*
-%{_datadir}/applications/gnome-power-preferences.desktop
 %{_libexecdir}/gnome-brightness-applet
 %{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server
 %{_datadir}/gnome-2.0/ui/GNOME_BrightnessApplet.xml
@@ -181,6 +197,12 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Sat Aug 29 2009 Bernie Innocenti <bernie@codewiz.org> - 2.27.91-3
+- Move GNOME help files to to gnome-power-manager-applets
+
+* Sat Aug 29 2009 Bernie Innocenti <bernie@codewiz.org> - 2.27.91-2
+- Split GNOME dependant parts to gnome-power-manager-applets
+
 * Mon Aug 24 2009 Richard Hughes  <rhughes@redhat.com> - 2.27.91-1
 - Update to 2.27.91