- 2.20.0

Changed files:
    gnome-power-manager-desktop.patch -> 1.6
    gnome-power-manager-popt.patch -> 1.2
    gnome-power-manager.spec -> 1.51

diff --git a/gnome-power-manager-desktop.patch b/gnome-power-manager-desktop.patch
index c66574ec00f7f7fae37d16b1477c939712a5ce7f..9a744893d362e7b0d21ca9c846aae583940d7dce 100644 (file)
--- a/gnome-power-manager-desktop.patch
+++ b/gnome-power-manager-desktop.patch
@@ -17,7 +17,7 @@ diff -urN gnome-power-manager-2.18.1/data/gnome-power-statistics.desktop.in gnom
  Exec=gnome-power-statistics
  Terminal=false
  Type=Application
--Categories=GNOME;GTK;Application;System;X-Red-Hat-Base;
+-Categories=GNOME;GTK;System;X-Red-Hat-Base;
 +Categories=GNOME;GTK;System;Monitor;
  OnlyShowIn=GNOME;
  StartupNotify=true

diff --git a/gnome-power-manager-popt.patch b/gnome-power-manager-popt.patch
index 9e4921c8d1fdaff083c874096cc0762f7dd24046..7ba6cb13cfb26534cbbe70eb402108466f4d284a 100644 (file)
--- a/gnome-power-manager-popt.patch
+++ b/gnome-power-manager-popt.patch
@@ -1,25 +1,6 @@
---- gnome-power-manager-2.19.6/src/gpm-notify.c~       2007-07-20 15:26:38.000000000 +0200
-+++ gnome-power-manager-2.19.6/src/gpm-notify.c        2007-08-29 05:52:05.238183608 +0200
-@@ -34,6 +34,7 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
-+#include <libgnome/gnome-i18n.h>
- #include <libgnome/libgnome.h>
- 
- #include <glib/gi18n.h>
---- gnome-power-manager-2.19.6/src/gpm-control.c~      2007-07-26 14:22:55.000000000 +0200
-+++ gnome-power-manager-2.19.6/src/gpm-control.c       2007-08-29 05:58:49.176560277 +0200
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <libgnome/gnome-i18n.h>
- #include <libgnomeui/gnome-client.h>
- 
- #include <string.h>
---- gnome-power-manager-2.19.6/applets/brightness/brightness-applet.c~ 2007-07-17 23:26:42.000000000 +0200
-+++ gnome-power-manager-2.19.6/applets/brightness/brightness-applet.c  2007-08-29 06:12:07.054838943 +0200
+diff -urN gnome-power-manager-2.19.92/applets/brightness/brightness-applet.c gnome-power-manager-2.19.92.new/applets/brightness/brightness-applet.c
+--- gnome-power-manager-2.19.92/applets/brightness/brightness-applet.c 2007-08-14 22:29:10.000000000 +0200
++++ gnome-power-manager-2.19.92.new/applets/brightness/brightness-applet.c     2007-09-04 20:56:48.000000000 +0200
 @@ -27,6 +27,7 @@
  
  #include <stdio.h>
@@ -28,8 +9,9 @@
  #include <panel-applet.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkbox.h>
---- gnome-power-manager-2.19.6/applets/inhibit/inhibit-applet.c~       2007-07-24 22:39:25.000000000 +0200
-+++ gnome-power-manager-2.19.6/applets/inhibit/inhibit-applet.c        2007-08-29 06:18:47.493749476 +0200
+diff -urN gnome-power-manager-2.19.92/applets/inhibit/inhibit-applet.c gnome-power-manager-2.19.92.new/applets/inhibit/inhibit-applet.c
+--- gnome-power-manager-2.19.92/applets/inhibit/inhibit-applet.c       2007-08-14 22:29:10.000000000 +0200
++++ gnome-power-manager-2.19.92.new/applets/inhibit/inhibit-applet.c   2007-09-04 20:57:12.000000000 +0200
 @@ -27,6 +27,7 @@
  
  #include <stdio.h>
@@ -38,3 +20,26 @@
  #include <panel-applet.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkbox.h>
+diff -urN gnome-power-manager-2.19.92/src/gpm-control.c gnome-power-manager-2.19.92.new/src/gpm-control.c
+--- gnome-power-manager-2.19.92/src/gpm-control.c      2007-07-27 01:28:18.000000000 +0200
++++ gnome-power-manager-2.19.92.new/src/gpm-control.c  2007-09-04 21:06:43.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <errno.h>
++#include <libgnome/gnome-i18n.h>
+ #include <libgnomeui/gnome-client.h>
+ 
+ #include <string.h>
+diff -urN gnome-power-manager-2.19.92/src/gpm-notify.c gnome-power-manager-2.19.92.new/src/gpm-notify.c
+--- gnome-power-manager-2.19.92/src/gpm-notify.c       2007-08-03 19:13:36.000000000 +0200
++++ gnome-power-manager-2.19.92.new/src/gpm-notify.c   2007-09-04 20:55:19.000000000 +0200
+@@ -34,7 +34,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+-
++#include <libgnome/gnome-i18n.h>
+ #include <glib/gi18n.h>
+ #include <dbus/dbus-glib.h>
+ #include <gtk/gtk.h>

diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index af0860829f4da2cbf17058bff77f8b5f745acdaa..de61fb6c460629ed9cb03cec345f79a01d85280c 100644 (file)
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -1,13 +1,14 @@
 Summary:       GNOME Power Manager
 Summary(pl.UTF-8):     Zarządca energii dla GNOME
 Name:          gnome-power-manager
-Version:       2.18.3
+Version:       2.20.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 3341092fc87ced400631c3d635979426
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5: 881f012dcbdff38a85603393cb9d39bb
 Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-popt.patch
 URL:           http://www.gnome.org/projects/gnome-power-manager/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -16,16 +17,18 @@ BuildRequires:      docbook-dtd41-sgml
 BuildRequires: docbook-utils
 BuildRequires: gnome-common >= 2.18.0
 BuildRequires: gnome-doc-utils
-BuildRequires: gnome-keyring-devel >= 0.8.1
-BuildRequires: gnome-panel-devel >= 2.18.0
-BuildRequires: gtk+2-devel >= 1:2.10.10
-BuildRequires: hal-devel >= 0.5.7.1
-BuildRequires: intltool >= 0.35.5
-BuildRequires: libglade2-devel >= 2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
+BuildRequires: gnome-keyring-devel >= 2.19.91
+BuildRequires: gnome-panel-devel >= 2.19.6
+BuildRequires: gtk+2-devel >= 1:2.10.14
+BuildRequires: gtkunique-devel >= 0.9.1
+BuildRequires: gstreamer-devel >= 0.10.14
+BuildRequires: hal-devel >= 0.5.9
+BuildRequires: intltool >= 0.36.1
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.19.1
 BuildRequires: libnotify-devel >= 0.4.3
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.18.0
+BuildRequires: libwnck-devel >= 2.20.0
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
@@ -33,7 +36,7 @@ Requires(post,preun): GConf2
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
-Requires:      gnome-session >= 2.18.0
+Requires:      gnome-session >= 2.19.90
 Requires:      notification-daemon >= 0.3.5
 Obsoletes:     gnome-power
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,14 +87,17 @@ Zastosowania infrastruktury zarządcy energii GNOME:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %configure \
+       --enable-xevents \
        --disable-schemas-install \
        --disable-scrollkeeper
 %{__make}
@@ -130,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-power-manager
 %attr(755,root,root) %{_bindir}/gnome-power-preferences
 %attr(755,root,root) %{_bindir}/gnome-power-statistics
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf
 %{_libdir}/bonobo/servers/GNOME_BrightnessApplet.server
 %{_libdir}/bonobo/servers/GNOME_InhibitApplet.server
 %{_datadir}/gnome/autostart/gnome-power-manager.desktop
@@ -144,9 +149,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/*/*
 %dir %{_omf_dest_dir}/gnome-power-manager
 %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-C.omf
+%lang(ca) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-ca.omf
 %lang(es) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-es.omf
 %lang(fr) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-fr.omf
 %lang(hu) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-hu.omf
+%lang(it) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-it.omf
+%lang(oc) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-oc.omf
 %lang(pa) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-pa.omf
 %lang(ru) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-ru.omf
 %lang(sv) %{_omf_dest_dir}/gnome-power-manager/gnome-power-manager-sv.omf