[sshmenu] Enable the sshmenu-gnome command in the main package (#711555).

[Matthias Saou]

commit 14ad3317190a634445e727115fb2de0112ce6b2e
Author: Matthias Saou <thias at marmotte.net>
Date:   Sat Jul 9 23:27:09 2011 +0200

    Enable the sshmenu-gnome command in the main package (#711555).

 sshmenu.spec |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/sshmenu.spec b/sshmenu.spec
index d02cba8..fad729a 100644
--- a/sshmenu.spec
+++ b/sshmenu.spec
@@ -3,7 +3,7 @@
 Summary: Application to organize SSH connection information in a menu
 Name: sshmenu
 Version: 3.18
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: User Interface/Desktops
 URL: http://sshmenu.sourceforge.net/
@@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ruby
 Requires: openssh-askpass
 Requires: ruby(abi) = 1.8
+Requires: ruby(gconf2)
 Requires: ruby(gtk2)
 # We only have ruby scripts and data, and the bonobo file gets picked up fine
 BuildArch: noarch
@@ -28,7 +29,6 @@ have the full GNOME applet version of the menu, install gnome-applet-sshmenu.
 Summary: GNOME panel applet to organize SSH connection information in a menu
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-Requires: ruby(gconf2)
 Requires: ruby(panelapplet2)
 
 %description -n gnome-applet-sshmenu
@@ -53,9 +53,7 @@ keeps all your regular SSH connections within a single panel menu.
 # On RHEL we are missing libs to get the gnome applet working (#463022)
 # On Fedora 15, no more ruby-panelapplet2 because of GNOME3
 %if 0%{?fedora}%{?rhel:15} >= 15
-%{__rm} -rf %{buildroot}%{_bindir}/sshmenu-gnome
 %{__rm} -rf %{buildroot}%{_prefix}/lib/bonobo/
-%{__rm} -rf %{buildroot}%{ruby_sitelib}/gnome-sshmenu.rb
 %{__rm} -rf %{buildroot}%{_libexecdir}/sshmenu-applet
 %{__rm} -rf %{buildroot}%{_datadir}/icons/
 %endif
@@ -83,7 +81,9 @@ fi
 %doc Changes License.txt README
 %{_sysconfdir}/bash_completion.d/
 %{_bindir}/sshmenu
+%{_bindir}/sshmenu-gnome
 %{ruby_sitelib}/sshmenu.rb
+%{ruby_sitelib}/gnome-sshmenu.rb
 %{_mandir}/man1/sshmenu.1*
 
 
@@ -91,15 +91,16 @@ fi
 # On Fedora 15, no more ruby-panelapplet2 because of GNOME3
 %if 0%{?fedora}%{?rhel:15} < 15
 %files -n gnome-applet-sshmenu
-%{_bindir}/sshmenu-gnome
 %{_prefix}/lib/bonobo/servers/sshmenu-applet.server
-%{ruby_sitelib}/gnome-sshmenu.rb
 %{_libexecdir}/sshmenu-applet
 %{_datadir}/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
 %endif
 
 
 %changelog
+* Sat Jul  9 2011 Matthias Saou <http://freshrpms.net/> 3.18-5
+- Enable the sshmenu-gnome command in the main package (#711555).
+
 * Sat Jul  9 2011 Matthias Saou <http://freshrpms.net/> 3.18-4
 - Disable gnome-applet-sshmenu on F15+ as ruby-panelapplet2 is no longer there.