rpms/gnome-power-manager/devel .cvsignore, 1.63, 1.64 gnome-power-manager.spec, 1.169, 1.170 sources, 1.64, 1.65 dpmsstr-no-needed.patch, 1.1, NONE

Thu Jul 30 10:08:52 UTC 2009

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26891

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Removed Files:
	dpmsstr-no-needed.patch 
Log Message:
* Thu Jul 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.3-0.5.20090730git
- Update to todays git snapshot.
- Split the inhibit applet and gnome-power-statistics into an
  gnome-power-manager-extra subpackage.
- Remove upstreamed patches.
- Fixes #514249



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64

--- .cvsignore	27 Jul 2009 17:57:47 -0000	1.63
+++ .cvsignore	30 Jul 2009 10:08:51 -0000	1.64
@@ -1 +1 @@
-gnome-power-manager-2.27.3-20090727.tar.gz
+gnome-power-manager-2.27.3-20090730.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- gnome-power-manager.spec	28 Jul 2009 01:26:20 -0000	1.169
+++ gnome-power-manager.spec	30 Jul 2009 10:08:51 -0000	1.170
@@ -1,19 +1,17 @@
 %define hal_version  0.5.8
 %define dbus_version 0.61
-%define alphatag                20090727
+%define alphatag                20090730
 
-Summary: GNOME Power Manager
+Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.27.3
 #Release: 2%{?dist}
-Release: 0.4.%{?alphatag}git%{?dist}
+Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
 #Source: http://download.gnome.org/sources/gnome-power-manager/2.27/gnome-power-manager-%{version}.tar.gz
 Source:   http://download.gnome.org/sources/gnome-power-manager/2.27/%{name}-%{version}-%{?alphatag}.tar.gz
 
-Patch0: dpmsstr-no-needed.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -54,10 +52,17 @@ displaying icons and handling user callb
 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
 %setup -q -n %{?name}-%{?version}-%{?alphatag}
-%patch0 -p1 -b .dpmsstr-not-needed
 
 %build
 %configure \
@@ -112,7 +117,7 @@ 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
+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
@@ -133,33 +138,56 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-scrollkeeper-update -q
+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
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING README
-%{_bindir}/*
-%{_libexecdir}/gnome-brightness-applet
-%{_libexecdir}/gnome-inhibit-applet
+%{_bindir}/gnome-power-bugreport.sh
+%{_bindir}/gnome-power-manager
+%{_bindir}/gnome-power-preferences
 %dir %{_datadir}/gnome-power-manager
-%{_datadir}/gnome-power-manager/*.ui
-%{_mandir}/man1/*
+%{_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
 %{_datadir}/omf/gnome-power-manager
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/gnome-power-manager/icons/hicolor/*/*/*.*
-%{_datadir}/icons/hicolor/*/apps/*.*
-%{_datadir}/gnome/help/gnome-power-manager
-%{_datadir}/applications/*.desktop
-%{_libdir}/bonobo/servers/GNOME_*.server
-%{_datadir}/gnome-2.0/ui/GNOME_*.xml
+%{_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.*
 
 %changelog
+* Thu Jul 30 2009 Richard Hughes  <rhughes at redhat.com> - 2.27.3-0.5.20090730git
+- Update to todays git snapshot.
+- Split the inhibit applet and gnome-power-statistics into an
+  gnome-power-manager-extra subpackage.
+- Remove upstreamed patches.
+- Fixes #514249
+
 * Mon Jul 27 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.3-0.4.20090727git
 - Drop an unneeded include that broke the build
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	27 Jul 2009 17:57:47 -0000	1.64
+++ sources	30 Jul 2009 10:08:51 -0000	1.65
@@ -1 +1 @@
-c554a2b0f2f08b73875f7c8e2a537c8b  gnome-power-manager-2.27.3-20090727.tar.gz
+5e5e5c176d8909e7e6e7e603d9ff7cd3  gnome-power-manager-2.27.3-20090730.tar.gz


--- dpmsstr-no-needed.patch DELETED ---


