summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2006-12-05 18:05:56 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2006-12-05 18:05:56 +0000
commit711487b5ff6f29f8f8c07d88e780a64c422ba09d (patch)
treeaa2fdcf1a63745153261c24444469e1b6bd4644b
parent0cc8510e9df18b8dcb278b957ccfed996833bcec (diff)
downloadgnome-panel-711487b5ff6f29f8f8c07d88e780a64c422ba09d.tar.gz
gnome-panel-711487b5ff6f29f8f8c07d88e780a64c422ba09d.tar.xz
gnome-panel-711487b5ff6f29f8f8c07d88e780a64c422ba09d.zip
-rw-r--r--.cvsignore2
-rw-r--r--gnome-panel.spec3
-rw-r--r--sources2
3 files changed, 3 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore
index de233e2..e0e70ab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.16.1.tar.bz2
+gnome-panel-2.16.2.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 433f1c0..81969d3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -90,7 +90,6 @@ Patch14: gnome-panel-2.15.92-no-seconds.patch
Patch15: gnome-panel-2.16.0-compiz-support.patch
# gnome bugzilla 365640
Patch16: gnome-panel-2.16.0-fix-chinese.patch
-Patch17: gnome-panel-2.16.1-launcher-copy.patch
Patch18: gnome-panel-2.16.0-respect-session-properties.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -126,7 +125,6 @@ Panel Applets using the libpanel-applet library.
%patch14 -p1 -b .no-seconds
%patch15 -p0 -b .compiz-support
%patch16 -p1 -b .fix-chinese
-%patch17 -p1 -b .launcher-copy
%patch18 -p1 -b .respect-session-properties.patch
. %{SOURCE4}
@@ -302,6 +300,7 @@ fi
%changelog
* Tue Dec 5 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.2-1
- Update to 2.16.2
+- Drop upstreamed patches
* Wed Nov 29 2006 Ray Strode <rstrode@redhat.com> - 2.16.1-8
- don't ask user if they want to logout if they've set the
diff --git a/sources b/sources
index 735577f..e59d53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0131e0b33a63b17b22b4d78b00291f8 gnome-panel-2.16.1.tar.bz2
+82b98a9b2685cca2d381e185cae47596 gnome-panel-2.16.2.tar.bz2