rpms/sshmenu/devel sshmenu-3.15-libexec.patch, NONE, 1.1 sshmenu-3.15-sitelib.patch, NONE, 1.1 sshmenu.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Feb 3 22:54:10 UTC 2008

Author: thias

Update of /cvs/extras/rpms/sshmenu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16642/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sshmenu-3.15-libexec.patch sshmenu-3.15-sitelib.patch 
	sshmenu.spec 
Log Message:
Initial import.


sshmenu-3.15-libexec.patch:

--- NEW FILE sshmenu-3.15-libexec.patch ---
diff -Naupr sshmenu-3.15.orig/Makefile sshmenu-3.15/Makefile
--- sshmenu-3.15.orig/Makefile	2007-10-15 11:20:19.000000000 +0200
+++ sshmenu-3.15/Makefile	2007-12-18 19:53:59.000000000 +0100
@@ -1,5 +1,6 @@
 BIN   = $(DESTDIR)/usr/bin
 LIB   = $(DESTDIR)/usr/lib
+LIBEXEC = $(DESTDIR)/usr/libexec
 MAN   = $(DESTDIR)/usr/share/man
 SHARE = $(DESTDIR)/usr/share
 
@@ -12,12 +13,12 @@ TEST:
 
 install:
 	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
-	install -d $(LIB)/gnome-panel $(SHARE)/icons/hicolor/48x48/apps
+	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
 	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
 	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
-	install -m755 sshmenu-applet $(LIB)/gnome-panel/sshmenu-applet
+	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1
 	install -m644 gnome-sshmenu-applet.png $(SHARE)/icons/hicolor/48x48/apps/gnome-sshmenu-applet.png
 	install -m755 bin/sshmenu $(BIN)/sshmenu
diff -Naupr sshmenu-3.15.orig/sshmenu-applet.server sshmenu-3.15/sshmenu-applet.server
--- sshmenu-3.15.orig/sshmenu-applet.server	2007-10-15 11:20:19.000000000 +0200
+++ sshmenu-3.15/sshmenu-applet.server	2007-12-18 20:15:37.000000000 +0100
@@ -1,6 +1,6 @@
 <oaf_info>
 <oaf_server iid="OAFIID:GNOME_SSHMenuApplet_Factory" type="exe"
-            location="/usr/lib/gnome-panel/sshmenu-applet">
+            location="/usr/libexec/sshmenu-applet">
 
         <oaf_attribute name="repo_ids" type="stringv">
                 <item value="IDL:Bonobo/GenericFactory:1.0"/>

sshmenu-3.15-sitelib.patch:

--- NEW FILE sshmenu-3.15-sitelib.patch ---
diff -Naupr sshmenu-3.15.orig/Makefile sshmenu-3.15/Makefile
--- sshmenu-3.15.orig/Makefile	2008-01-14 22:59:16.000000000 +0100
+++ sshmenu-3.15/Makefile	2008-01-14 23:00:25.000000000 +0100
@@ -12,11 +12,11 @@ TEST:
 	RUBYLIB=lib ruby test/ts_all.rb test/tc*.rb
 
 install:
-	install -d $(BIN) $(LIB)/ruby/1.8 $(LIB)/bonobo/servers
+	install -d $(BIN) $(LIB)/ruby/site_ruby/1.8 $(LIB)/bonobo/servers
 	install -d $(LIBEXEC) $(SHARE)/icons/hicolor/48x48/apps
 	install -d $(MAN)/man1
-	install -m644 lib/sshmenu.rb $(LIB)/ruby/1.8/sshmenu.rb
-	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/1.8/gnome-sshmenu.rb
+	install -m644 lib/sshmenu.rb $(LIB)/ruby/site_ruby/1.8/sshmenu.rb
+	install -m644 lib/gnome-sshmenu.rb $(LIB)/ruby/site_ruby/1.8/gnome-sshmenu.rb
 	install -m644 sshmenu-applet.server $(LIB)/bonobo/servers/sshmenu-applet.server
 	install -m755 sshmenu-applet $(LIBEXEC)/sshmenu-applet
 	install -m644 sshmenu.1 $(MAN)/man1/sshmenu.1


--- NEW FILE sshmenu.spec ---
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}

Summary: Application to organize SSH connection information in a menu
Name: sshmenu
Version: 3.15
Release: 5%{?dist}
License: BSD
Group: User Interface/Desktops
URL: http://sshmenu.sourceforge.net/
Source0: http://dl.sf.net/sshmenu/sshmenu-%{version}.tar.gz
Patch0: sshmenu-3.15-libexec.patch
Patch1: sshmenu-3.15-sitelib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: ruby
Requires: openssh-askpass
Requires: ruby(abi) = 1.8
Requires: ruby(gtk2)
# We only have ruby scripts and data, and the bonobo file gets picked up fine
BuildArch: noarch

%description
SSHMenu is a small program (which is to be used outside of GNOME) that
keeps all your regular SSH connections within a single menu. If you wish to
have the full GNOME applet version of the menu, install gnome-applet-sshmenu.


%package -n 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
SSHMenu is a GNOME panel applet (which can also be used outside of GNOME) that
keeps all your regular SSH connections within a single panel menu.


%prep
%setup -q
%patch0 -p1 -b .libexec
%patch1 -p1 -b .sitelib


%build
# Nope... only ruby scripts :-)


%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}


%clean
%{__rm} -rf %{buildroot}


%post -n gnome-applet-sshmenu
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun -n gnome-applet-sshmenu
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc Changes License.txt README
%{_bindir}/sshmenu
%{ruby_sitelib}/sshmenu.rb
%{_mandir}/man1/sshmenu.1*

%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


%changelog
* Thu Jan 17 2008 Matthias Saou <http://freshrpms.net/> 3.15-5
- Move gnome-sshmenu.rb to gnome-applet-sshmenu too.

* Wed Jan 16 2008 Matthias Saou <http://freshrpms.net/> 3.15-4
- Keep only ruby(gtk2) req in sshmenu, move others to gnome-applet-sshmenu.

* Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 3.15-3
- Split out the GNOME applet as gnome-applet-sshmenu while keeping the basic
  menu application as sshmenu, and have all the shared ruby files be there.

* Mon Jan 14 2008 Matthias Saou <http://freshrpms.net/> 3.15-2
- Follow ruby guidelines : Put ruby files in ruby_sitelib.
- Add required hardcoded ruby abi version requirement.

* Tue Dec 18 2007 Matthias Saou <http://freshrpms.net/> 3.15-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Feb 2008 20:15:15 -0000	1.1
+++ .cvsignore	3 Feb 2008 22:53:38 -0000	1.2
@@ -0,0 +1 @@
+sshmenu-3.15.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Feb 2008 20:15:15 -0000	1.1
+++ sources	3 Feb 2008 22:53:38 -0000	1.2
@@ -0,0 +1 @@
+baab4a14015ed80deede648cada1f215  sshmenu-3.15.tar.gz


