rpms/gnome-power-manager/devel .cvsignore, 1.73, 1.74 gnome-power-manager.spec, 1.187, 1.188 sources, 1.76, 1.77

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-power-manager/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28518

Modified Files:
	.cvsignore gnome-power-manager.spec sources 
Log Message:
* Wed Jun 02 2010 Richard Hughes  <rhughes at redhat.com> - 2.31.1-1
- New upstream release.
- This release no longer requires HAL. It may also eat your cat.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/.cvsignore,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- .cvsignore	29 Mar 2010 10:41:14 -0000	1.73
+++ .cvsignore	2 Jun 2010 18:17:08 -0000	1.74
@@ -1 +1 @@
-gnome-power-manager-2.30.0.tar.gz
+gnome-power-manager-2.31.1.tar.gz


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- gnome-power-manager.spec	27 Apr 2010 02:23:20 -0000	1.187
+++ gnome-power-manager.spec	2 Jun 2010 18:17:09 -0000	1.188
@@ -1,14 +1,14 @@
 %define dbus_version 0.61
-%define alphatag                20090730
-%define hal_version  0.5.8
 
 Summary: GNOME power management service
 Name: gnome-power-manager
-Version: 2.30.1
+Version: 2.31.1
 Release: 1%{?dist}
+#Release: 0.1.%{?alphatag}git%{?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
+Source: http://download.gnome.org/sources/gnome-power-manager/2.31/gnome-power-manager-%{version}.tar.gz
+#Source:   http://download.gnome.org/sources/gnome-power-manager/2.31/%{name}-%{version}-%{?alphatag}.tar.gz
 
 URL: http://projects.gnome.org/gnome-power-manager/
 
@@ -24,8 +24,7 @@ BuildRequires: libtool
 BuildRequires: cairo-devel
 BuildRequires: libcanberra-devel
 BuildRequires: unique-devel
-BuildRequires: DeviceKit-power-devel >= 008
-BuildRequires: hal-devel >= %{hal_version}
+BuildRequires: upower-devel >= 0.9.0
 BuildRequires: intltool
 Requires: gtk2 >= 2.10.0
 Requires: gnome-icon-theme
@@ -34,33 +33,28 @@ Requires: libcanberra
 Requires: dbus-glib >= %{dbus_version}
 Requires: dbus-x11 >= %{dbus_version}
 Requires: unique >= 0.9.4
-Requires: DeviceKit-power >= 008
-Requires: hal >= %{hal_version}
+Requires: upower >= 0.9.0
 Requires(post): scrollkeeper
 Requires(pre): GConf2
 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
 
 %build
-%configure --disable-scrollkeeper --enable-hal
+%configure --disable-scrollkeeper
 make
 
 # strip unneeded translations from .mo files
@@ -102,9 +96,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 +118,31 @@ 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
+%{_datadir}/polkit-1/actions/org.gnome.power.policy
+%dir %{_datadir}/gnome-power-manager
+%{_libdir}/bonobo/servers/*.server
+%{_libexecdir}/*
+%{_mandir}/man1/*.1.gz
+%{_sbindir}/*
+%{_sysconfdir}/gconf/schemas/*.schemas
+%{_sysconfdir}/xdg/autostart/*.desktop
 
 %changelog
+* Wed Jun 02 2010 Richard Hughes  <rhughes at redhat.com> - 2.31.1-1
+- New upstream release.
+- This release no longer requires HAL. It may also eat your cat.
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/devel/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources	27 Apr 2010 02:23:20 -0000	1.76
+++ sources	2 Jun 2010 18:17:09 -0000	1.77
@@ -1 +1 @@
-47290371538ced9696af021049c590c3  gnome-power-manager-2.30.1.tar.gz
+1c45fc5c37527c2ab5ab87348021fbb0  gnome-power-manager-2.31.1.tar.gz