- rel 2

- resurrected desktop patch (yes, it's still needed)

Changed files:
    gnome-power-manager-desktop.patch -> 1.7
    gnome-power-manager.spec -> 1.76

diff --git a/gnome-power-manager-desktop.patch b/gnome-power-manager-desktop.patch
index 9a744893d362e7b0d21ca9c846aae583940d7dce..1550c2773c86bafaf597962d2185751ef46f21dd 100644 (file)
--- a/gnome-power-manager-desktop.patch
+++ b/gnome-power-manager-desktop.patch
@@ -1,24 +1,24 @@
-diff -urN gnome-power-manager-2.18.1/data/gnome-power-preferences.desktop.in gnome-power-manager-2.18.1.new/data/gnome-power-preferences.desktop.in
---- gnome-power-manager-2.18.1/data/gnome-power-preferences.desktop.in 2007-03-04 18:53:44.000000000 +0100
-+++ gnome-power-manager-2.18.1.new/data/gnome-power-preferences.desktop.in     2007-04-04 22:54:46.000000000 +0200
-@@ -6,7 +6,7 @@
+diff -ur gnome-power-manager-2.30.1/data/gnome-power-preferences.desktop.in gnome-power-manager-2.30.1.desktop/data/gnome-power-preferences.desktop.in
+--- gnome-power-manager-2.30.1/data/gnome-power-preferences.desktop.in 2010-04-26 11:13:29.000000000 +0200
++++ gnome-power-manager-2.30.1.desktop/data/gnome-power-preferences.desktop.in 2010-05-11 00:27:32.029611817 +0200
+@@ -5,7 +5,7 @@
  Exec=gnome-power-preferences
  Terminal=false
  Type=Application
--Categories=Settings;X-GNOME-SystemSettings;
-+Categories=GTK;GNOME;Settings;X-GNOME-SystemSettings;X-Capplet;
- OnlyShowIn=GNOME;
+-Categories=Settings;HardwareSettings;
++Categories=GNOME;GTK;Settings;HardwareSettings;
+ OnlyShowIn=GNOME;XFCE;
  StartupNotify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
-diff -urN gnome-power-manager-2.18.1/data/gnome-power-statistics.desktop.in gnome-power-manager-2.18.1.new/data/gnome-power-statistics.desktop.in
---- gnome-power-manager-2.18.1/data/gnome-power-statistics.desktop.in  2007-03-04 18:53:44.000000000 +0100
-+++ gnome-power-manager-2.18.1.new/data/gnome-power-statistics.desktop.in      2007-04-04 22:56:54.000000000 +0200
-@@ -6,7 +6,7 @@
- Exec=gnome-power-statistics
+diff -ur gnome-power-manager-2.30.1/data/gnome-power-preferences.desktop.in.in gnome-power-manager-2.30.1.desktop/data/gnome-power-preferences.desktop.in.in
+--- gnome-power-manager-2.30.1/data/gnome-power-preferences.desktop.in.in      2010-03-31 17:24:07.000000000 +0200
++++ gnome-power-manager-2.30.1.desktop/data/gnome-power-preferences.desktop.in.in      2010-05-11 00:27:44.769611550 +0200
+@@ -5,7 +5,7 @@
+ Exec=gnome-power-preferences
  Terminal=false
  Type=Application
--Categories=GNOME;GTK;System;X-Red-Hat-Base;
-+Categories=GNOME;GTK;System;Monitor;
- OnlyShowIn=GNOME;
+-Categories=Settings;HardwareSettings;
++Categories=GNOME;GTK;Settings;HardwareSettings;
+ OnlyShowIn=GNOME;XFCE;
  StartupNotify=true
  X-GNOME-Bugzilla-Bugzilla=GNOME

diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 39da29b3246f7f4820c2fac3c473975d378eecd2..d37cfbb6024c18784a6901d0ed99469a69a28e6f 100644 (file)
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -2,11 +2,12 @@ Summary:      GNOME Power Manager
 Summary(pl.UTF-8):     Zarządca energii dla GNOME
 Name:          gnome-power-manager
 Version:       2.30.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-power-manager/2.30/%{name}-%{version}.tar.bz2
 # Source0-md5: b85178b8db77db5d22e185430549a295
+Patch0:                %{name}-desktop.patch
 URL:           http://www.gnome.org/projects/gnome-power-manager/
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: UPower-devel
@@ -91,6 +92,7 @@ Zastosowania infrastruktury zarządcy energii GNOME:
 
 %prep
 %setup -q
+%patch0 -p1
 
 sed -i -e 's/^en@shaw//' po/LINGUAS
 rm -f po/en@shaw.po