rpms/gnome-power-manager/F-13 gnome-power-manager.spec,1.185,1.186

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28052

Modified Files:
	gnome-power-manager.spec 
Log Message:
* Wed Jun 02 2010 Richard Hughes  <rhughes at redhat.com> - 2.30.1-2
- Remove the extra subpackage, we need gnome-power-statistics
  installed by default for the battery info view now.
- Resolves: #596233



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-13/gnome-power-manager.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- gnome-power-manager.spec	26 Apr 2010 09:53:21 -0000	1.185
+++ gnome-power-manager.spec	2 Jun 2010 09:46:40 -0000	1.186
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.30.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.30/gnome-power-manager-%{version}.tar.gz
@@ -42,20 +42,16 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
+# obsolete sub-package
+Obsoletes: gnome-power-manager-extra <= 2.30.1
+Provides: gnome-power-manager-extra
+
 %description
-GNOME Power Manager uses the information and facilities provided by HAL
+GNOME Power Manager uses the information and facilities provided by UPower
 displaying icons and handling user callbacks in an interactive GNOME session.
 GNOME Power Preferences allows authorised users to set policy and
 change preferences.
 
-%package extra
-Summary: GNOME Power Manager extra utility programs
-Group: Applications/System
-Requires: %{name} = %{version}-%{release}
-
-%description extra
-Extra GNOME power management applications that are not normally needed.
-
 %prep
 %setup -q
 
@@ -102,9 +98,6 @@ done
 
 %find_lang %name --with-gnome
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %gconf_schema_upgrade gnome-power-manager
 touch --no-create %{_datadir}/icons/hicolor
@@ -127,41 +120,30 @@ fi
 %files -f %{name}.lang
 %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/acme.ui
-%{_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
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/gnome-power-manager.service
-%{_datadir}/omf/gnome-power-manager
-%{_sysconfdir}/xdg/autostart/*.desktop
+%{_datadir}/gnome-2.0/ui/*.xml
+%{_datadir}/gnome-power-manager/*.ui
 %{_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
 %{_datadir}/icons/hicolor/*/apps/gnome-brightness-applet.*
-
-%files extra
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
-%{_bindir}/gnome-power-statistics
-%{_mandir}/man1/gnome-power-statistics.1.gz
-%{_datadir}/gnome-power-manager/gpm-statistics.ui
-%{_datadir}/applications/gnome-power-statistics.desktop
-%{_datadir}/icons/hicolor/*/apps/gnome-power-statistics.*
-%{_libexecdir}/gnome-inhibit-applet
-%{_libdir}/bonobo/servers/GNOME_InhibitApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
+%{_datadir}/icons/hicolor/*/apps/gnome-power-manager.*
+%{_datadir}/icons/hicolor/*/apps/gnome-power-statistics.*
+%{_datadir}/omf/gnome-power-manager
+%dir %{_datadir}/gnome-power-manager
+%{_libdir}/bonobo/servers/*.server
+%{_libexecdir}/*
+%{_mandir}/man1/*.1.gz
+%{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Wed Jun 02 2010 Richard Hughes  <rhughes at redhat.com> - 2.30.1-2
+- Remove the extra subpackage, we need gnome-power-statistics
+  installed by default for the battery info view now.
+- Resolves: #596233
+
 * Mon Apr 26 2010 Richard Hughes  <rhughes at redhat.com> - 2.30.1-1
 - New upstream release.
 - Fix up a critical warning from the GpmScreensaver code.