summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@fedoraproject.org>2006-02-27 17:11:50 +0000
committerRay Strode <rstrode@fedoraproject.org>2006-02-27 17:11:50 +0000
commit803518e0414acb27651ea3745073700c7646fdb2 (patch)
treea9fb077e03430d14c3138095e34405682b025d60
parentcd20820bd959cc99f58b53bba2ac117a22bfe8c1 (diff)
downloadgnome-panel-803518e0414acb27651ea3745073700c7646fdb2.tar.gz
gnome-panel-803518e0414acb27651ea3745073700c7646fdb2.tar.xz
gnome-panel-803518e0414acb27651ea3745073700c7646fdb2.zip
- ignore unknown options (bug 182734)gnome-panel-2_13_91-4
-rw-r--r--gnome-panel-2.13.91-ignore-unknown-options.patch11
-rw-r--r--gnome-panel.spec7
2 files changed, 17 insertions, 1 deletions
diff --git a/gnome-panel-2.13.91-ignore-unknown-options.patch b/gnome-panel-2.13.91-ignore-unknown-options.patch
new file mode 100644
index 0000000..e953555
--- /dev/null
+++ b/gnome-panel-2.13.91-ignore-unknown-options.patch
@@ -0,0 +1,11 @@
+--- gnome-panel-2.13.91/gnome-panel/main.c.ignore-unknown-options 2006-02-27 11:41:51.000000000 -0500
++++ gnome-panel-2.13.91/gnome-panel/main.c 2006-02-27 11:42:18.000000000 -0500
+@@ -49,6 +49,8 @@
+
+ context = g_option_context_new ("");
+
++ g_option_context_set_ignore_unknown_options (context, TRUE);
++
+ g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+
+ gnome_program_init ("gnome-panel", VERSION,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6b1c4b0..c3b1edc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,7 +16,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.13.91
-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
@@ -61,6 +61,7 @@ Patch5: gnome-panel-2.12.1-about-fedora.patch
Patch6: gnome-panel-2.13.5-switch-user.patch
Patch7: gnome-panel-2.13.91-gpm-integration.patch
Patch8: gnome-panel-2.13.90-use-beagle.patch
+Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
Conflicts: gnome-power-manager < 2.13.5.0.20060207-1
@@ -90,6 +91,7 @@ Panel Applets using the libpanel-applet library.
%patch6 -p1 -b .switch-user
%patch7 -p1 -b .gpm-integration
%patch8 -p1 -b .use-beagle
+%patch9 -p1 -b .ignore-unknown-options
cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE2} m4
@@ -206,6 +208,9 @@ fi
%{_datadir}/gtk-doc
%changelog
+* Mon Feb 27 2006 Ray Strode <rstrode@redhat.com> - 2.13.91-4
+- ignore unknown options (bug 182734)
+
* Sun Feb 19 2006 Ray Strode <rstrode@redhat.com> - 2.13.91-3
- bring back shutdown menu item