summaryrefslogtreecommitdiffstats
path: root/gnome-panel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-panel.spec')
-rw-r--r--gnome-panel.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1a08c2e..737b4b4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,7 +1,7 @@
%define gettext_package gnome-panel-2.0
%define gnome_desktop_version 2.11.1
-%define glib2_version 2.15.5
+%define glib2_version 2.25.9
%define gtk2_version 2.11.3
%define libgnome_version 2.13.0
%define libgnomeui_version 2.5.4
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
@@ -127,6 +127,9 @@ Patch48: gnome-panel-libs.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=621864
Patch49: gnome-panel-2.31.2-libm.patch
+# upstream fix
+Patch50: 0001-Update-to-GDBus-API-change.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -178,6 +181,7 @@ Panel Applets using the libpanel-applet library.
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
%patch49 -p1 -b .libm
+%patch50 -p1 -b .gdbus
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -371,6 +375,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Jun 21 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-4
+- Update for GLib api change
+
* Thu Jun 17 2010 Dan HorĂ¡k <dan[at]danny.cz> 2.31.2-3
- link also with libm