summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2006-06-14 04:09:01 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2006-06-14 04:09:01 +0000
commit0b95197b49c03702d60c95974384791b38401120 (patch)
treecfb83f1da264f00d5eaa839717cd35bed51a52e7
parent5cf42706b5be83d00319a2740116b20be9e9afcc (diff)
downloadgnome-panel-0b95197b49c03702d60c95974384791b38401120.tar.gz
gnome-panel-0b95197b49c03702d60c95974384791b38401120.tar.xz
gnome-panel-0b95197b49c03702d60c95974384791b38401120.zip
Adjust to gnome-power-manager changesgnome-panel-2_14_2-4
-rw-r--r--gnome-panel.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e143c2f..4e38101 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.14.2
-Release: 3
+Release: 4
URL: http://www.gnome.org
Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
Source1: redhat-panel-default-setup.entries
@@ -79,7 +79,7 @@ Patch8: gnome-panel-2.13.90-use-beagle.patch
Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
Patch10: gnome-panel-2.14.1-remove-duplicate-entry.patch
-Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
+Conflicts: gnome-power-manager < 2.15.3
%description
The GNOME panel provides the window list, workspace switcher, menus, and other
@@ -224,6 +224,10 @@ fi
%{_datadir}/gtk-doc
%changelog
+* Wed Jun 14 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-4
+- Update to new gnome-power-manager interface
+- Conflict with gnome-power-manager < 2.15.3
+
* Fri Jun 9 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-3
- Add missing BuildRequires