summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2006-05-30 03:05:10 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2006-05-30 03:05:10 +0000
commit139587d08ac8df95a02c3a339d9c7529b55f4dad (patch)
tree0562b9f12481c9209f677b9c14d5c9d54285bacd
parent519b6ef38027740a2b89eca7ae8d16ea58289689 (diff)
downloadgnome-panel-139587d08ac8df95a02c3a339d9c7529b55f4dad.tar.gz
gnome-panel-139587d08ac8df95a02c3a339d9c7529b55f4dad.tar.xz
gnome-panel-139587d08ac8df95a02c3a339d9c7529b55f4dad.zip
2.14.2
-rw-r--r--gnome-panel.spec6
1 files changed, 1 insertions, 5 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a200fd9..b448b25 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -74,9 +74,6 @@ Patch6: gnome-panel-2.13.5-switch-user.patch
Patch7: gnome-panel-2.14.0-gpm-integration.patch
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
-# http://bugzilla.gnome.org/show_bug.cgi?id=341517
-Patch11: gnome-panel-2.14.1-about.patch
Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
@@ -107,8 +104,6 @@ Panel Applets using the libpanel-applet library.
%patch7 -p1 -b .gpm-integration
%patch8 -p1 -b .use-beagle
%patch9 -p1 -b .ignore-unknown-options
-%patch10 -p1 -b .remove-duplicate-entry
-%patch11 -p1 -b .about
cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE2} m4
@@ -226,6 +221,7 @@ fi
%changelog
* Mon May 29 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-2
- Update to 2.14.2
+- Drop upstreamed patches
* Mon May 22 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-4
- Make it build in mock