add menus backgnome-panel-2_17_91-1_svn20070207_fc7

5 files changed, 61 insertions, 10 deletions

diff --git a/.cvsignore b/.cvsignore
index 4f7c5a9..f837f27 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.17.90.tar.bz2
+gnome-panel-2.17.91.svn20070207.tar.gz
diff --git a/gnome-panel-2.17.91-about-fedora.patch b/gnome-panel-2.17.91-about-fedora.patch
new file mode 100644
index 0000000..dee4085
--- /dev/null
+++ b/gnome-panel-2.17.91-about-fedora.patch
@@ -0,0 +1,10 @@
+--- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.about-fedora	2007-02-07 01:08:52.000000000 -0500
++++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c	2007-02-07 01:10:44.000000000 -0500
+@@ -717,6 +717,7 @@
+ 
+ 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
+ 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
++	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
+ 
+ 	if (parent->priv->append_lock_logout)
+ 		panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-2.17.91-vendor.patch b/gnome-panel-2.17.91-vendor.patch
new file mode 100644
index 0000000..7a630e5
--- /dev/null
+++ b/gnome-panel-2.17.91-vendor.patch
@@ -0,0 +1,38 @@
+--- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.vendor	2007-02-07 00:18:07.000000000 -0500
++++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c	2007-02-07 01:07:52.000000000 -0500
+@@ -576,7 +576,7 @@
+ 					      HOME_NAME_KEY,
+ 					      NULL);
+ 	panel_menu_items_append_from_desktop (places_menu,
+-					      "nautilus-home.desktop",
++					      "gnome-nautilus-home.desktop",
+ 					      gconf_name);
+ 	if (gconf_name)
+ 		g_free (gconf_name);
+@@ -611,7 +611,7 @@
+ 					      COMPUTER_NAME_KEY,
+ 					      NULL);
+ 	panel_menu_items_append_from_desktop (places_menu,
+-					      "nautilus-computer.desktop",
++					      "gnome-nautilus-computer.desktop",
+ 					      gconf_name);
+ 	if (gconf_name)
+ 		g_free (gconf_name);
+@@ -624,7 +624,7 @@
+ 	add_menu_separator (places_menu);
+ 
+ 	panel_menu_items_append_from_desktop (places_menu,
+-					      "network-scheme.desktop",
++					      "gnome-network-scheme.desktop",
+ 					      NULL);
+ 	panel_place_menu_item_append_volumes (places_menu, TRUE);
+ 
+@@ -715,7 +715,7 @@
+ 	if (add_separator)
+ 		add_menu_separator (menu);
+ 
+-	panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL);
++	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
+ 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+ 
+ 	if (parent->priv->append_lock_logout)
diff --git a/gnome-panel.spec b/gnome-panel.spec
index da2cf16..e57f6dc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -19,12 +19,14 @@
 
 %define use_evolution_data_server 1
 
+%define alphatag svn20070207
+
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.17.90
-Release: 1%{?dist} 
+Version: 2.17.91
+Release: 1.%{alphatag}%{?dist} 
 URL: http://www.gnome.org
-Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.17/%{name}-%{version}.%{alphatag}.tar.gz
 Source1: redhat-panel-default-setup.entries
 Source2: gnome-compiler-flags.m4
 Source3: redhat-panel-backwards-compat-config.schemas
@@ -80,9 +82,9 @@ BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
 
-Patch0: gnome-panel-2.17.90-vendor.patch
+Patch0: gnome-panel-2.17.91-vendor.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch5: gnome-panel-2.17.90-about-fedora.patch
+Patch5: gnome-panel-2.17.91-about-fedora.patch
 Patch8: gnome-panel-2.16.1-search.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=399270
 Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
@@ -93,6 +95,7 @@ Patch14: gnome-panel-2.17.90-no-seconds.patch
 Patch15: gnome-panel-2.16.0-compiz-support.patch
 # gnome bugzilla 365640
 Patch16: gnome-panel-2.16.0-fix-chinese.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=395416
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -103,7 +106,7 @@ features for the GNOME desktop.
 %package devel
 Summary: Headers and libraries for Panel Applet development
 Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: libbonoboui-devel >= %{libbonoboui_version}
 Requires: libgnomeui-devel >= %{libgnomeui_version}
@@ -114,7 +117,7 @@ Panel Applet development package. Contains files needed for developing
 Panel Applets using the libpanel-applet library.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.%{alphatag}
 
 %patch0 -p1 -b .vendor
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
@@ -136,7 +139,7 @@ cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
 %build
 # gpm-integration patches Makefile.am and configure.in
 aclocal -I m4
-automake
+automake --add-missing
 autoconf
 %configure \
    --disable-gtk-doc \
diff --git a/sources b/sources
index 5828830..c09df58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22f51578f9d70b4159246c04046152b0  gnome-panel-2.17.90.tar.bz2
+fedbfe906ab507ad15d609dc964f7ff6  gnome-panel-2.17.91.svn20070207.tar.gz