SPECS: gnome-power-manager.spec - 2.22.0 - merged from DEVEL

[patrys]

Author: patrys                       Date: Wed Mar 12 13:45:41 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-power-manager.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: SPECS/gnome-power-manager.spec
diff -u SPECS/gnome-power-manager.spec:1.55 SPECS/gnome-power-manager.spec:1.56
--- SPECS/gnome-power-manager.spec:1.55	Sat Dec 15 10:43:32 2007
+++ SPECS/gnome-power-manager.spec	Wed Mar 12 14:45:36 2008
@@ -2,34 +2,35 @@
 Summary:	GNOME Power Manager
 Summary(pl.UTF-8):	Zarządca energii dla GNOME
 Name:		gnome-power-manager
-Version:	2.20.2
+Version:	2.22.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	8a38e3a169b80c44639f4383a64835d0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	43c76a13a803a5c034f310bb20f91ff4
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-popt.patch
 URL:		http://www.gnome.org/projects/gnome-power-manager/
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd41-sgml
 BuildRequires:	docbook-utils
+BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-doc-utils
-BuildRequires:	gnome-keyring-devel >= 2.20.0
-BuildRequires:	gnome-panel-devel >= 2.20.0
-BuildRequires:	gtk+2-devel >= 1:2.12.0
-BuildRequires:	gtkunique-devel >= 0.9.1
+BuildRequires:	gnome-doc-utils >= 0.12.1
+BuildRequires:	gnome-keyring-devel >= 2.22.0
+BuildRequires:	gnome-panel-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 1:2.12.8
 BuildRequires:	gstreamer-devel >= 0.10.14
-BuildRequires:	hal-devel >= 0.5.9
-BuildRequires:	intltool >= 0.36.1
+BuildRequires:	hal-devel >= 0.5.10
+BuildRequires:	intltool >= 0.37.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.20.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.20.0
+BuildRequires:	libwnck-devel >= 2.22.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -39,7 +40,7 @@
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
-Requires:	gnome-session >= 2.20.0
+Requires:	gnome-session >= 2.22.0
 Requires:	notification-daemon >= 0.3.5
 Obsoletes:	gnome-power
 # sr at Latn vs. sr at latin
@@ -94,15 +95,15 @@
 %patch0 -p1
 %patch1 -p1
 
-sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
-mv -f po/sr\@{Latn,latin}.po
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv -f po/sr@{Latn,latin}.po
 
 %build
 %{__libtoolize}
 %{__intltoolize}
 %{__aclocal}
-%{__autoheader}
 %{__automake}
+%{__autoheader}
 %{__autoconf}
 %configure \
 	--enable-xevents \
@@ -137,13 +138,13 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gnome-brightness-applet
-%attr(755,root,root) %{_bindir}/gnome-inhibit-applet
 %attr(755,root,root) %{_bindir}/gnome-power-bugreport.sh
 %attr(755,root,root) %{_bindir}/gnome-power-cmd.sh
 %attr(755,root,root) %{_bindir}/gnome-power-manager
 %attr(755,root,root) %{_bindir}/gnome-power-preferences
 %attr(755,root,root) %{_bindir}/gnome-power-statistics
+%attr(755,root,root) %{_libdir}/gnome-brightness-applet
+%attr(755,root,root) %{_libdir}/gnome-inhibit-applet
 %{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server
 %{_libdir}/bonobo/servers/GNOME_InhibitApplet.server
 %{_datadir}/gnome/autostart/gnome-power-manager.desktop
@@ -163,6 +164,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2008-03-12 13:45:36  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.55.2.3  2008-03-12 13:44:41  patrys
+- 2.22.0
+
+Revision 1.55.2.2  2008-02-14 22:36:33  megabajt
+- updated to 2.21.92
+
+Revision 1.55.2.1  2007-12-20 15:23:59  patrys
+- 2.21.1
+
 Revision 1.55  2007-12-15 09:43:32  megabajt
 - updated to 2.20.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-power-manager.spec?r1=1.55&r2=1.56&f=u