rpms/sshmenu/EL-5 sshmenu-3.18-libexec.patch, NONE, 1.1 sshmenu-3.18-sitelib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 sshmenu.spec, 1.1, 1.2 sshmenu-3.15-libexec.patch, 1.1, NONE sshmenu-3.15-sitelib.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Tue Dec 8 18:53:15 UTC 2009 

Author: thias

Update of /cvs/extras/rpms/sshmenu/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18274

Modified Files:
	.cvsignore sources sshmenu.spec 
Added Files:
	sshmenu-3.18-libexec.patch sshmenu-3.18-sitelib.patch 
Removed Files:
	sshmenu-3.15-libexec.patch sshmenu-3.15-sitelib.patch 
Log Message:
Update to 3.18 and disable the gnome-applet-sshmenu sub-package.


sshmenu-3.18-libexec.patch:
 Makefile              |    5 +++--
 sshmenu-applet.server |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-libexec.patch ---
diff -Naupr sshmenu-3.18.orig/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.orig/Makefile	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/Makefile	2009-12-08 19:09:46.431319694 +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
 CFG   = $(DESTDIR)/etc
@@ -13,13 +14,13 @@ 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 -d $(CFG)/bash_completion.d
 	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.18.orig/sshmenu-applet.server sshmenu-3.18/sshmenu-applet.server
--- sshmenu-3.18.orig/sshmenu-applet.server	2009-08-24 10:25:06.000000000 +0200
+++ sshmenu-3.18/sshmenu-applet.server	2009-12-08 19:08:54.797319571 +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.18-sitelib.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE sshmenu-3.18-sitelib.patch ---
diff -Naupr sshmenu-3.18.libexec/Makefile sshmenu-3.18/Makefile
--- sshmenu-3.18.libexec/Makefile	2009-12-08 19:09:46.431319694 +0100
+++ sshmenu-3.18/Makefile	2009-12-08 19:15:33.952319721 +0100
@@ -13,12 +13,12 @@ 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 -d $(CFG)/bash_completion.d
-	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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Feb 2008 22:53:23 -0000	1.2
+++ .cvsignore	8 Dec 2009 18:53:15 -0000	1.3
@@ -1 +1 @@
-sshmenu-3.15.tar.gz
+sshmenu-3.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Feb 2008 22:53:23 -0000	1.2
+++ sources	8 Dec 2009 18:53:15 -0000	1.3
@@ -1 +1 @@
-baab4a14015ed80deede648cada1f215  sshmenu-3.15.tar.gz
+7e7f43135fd112be3c173ec8585d6b98  sshmenu-3.18.tar.gz


Index: sshmenu.spec
===================================================================
RCS file: /cvs/extras/rpms/sshmenu/EL-5/sshmenu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sshmenu.spec	3 Feb 2008 22:53:23 -0000	1.1
+++ sshmenu.spec	8 Dec 2009 18:53:15 -0000	1.2
@@ -2,14 +2,14 @@
 
 Summary: Application to organize SSH connection information in a menu
 Name: sshmenu
-Version: 3.15
-Release: 5%{?dist}
+Version: 3.18
+Release: 2%{?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
+Patch0: sshmenu-3.18-libexec.patch
+Patch1: sshmenu-3.18-sitelib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: ruby
 Requires: openssh-askpass
@@ -50,19 +50,28 @@ keeps all your regular SSH connections w
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
 
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{?rhel}
+%{__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
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
 %post -n gnome-applet-sshmenu
-touch --no-create %{_datadir}/icons/hicolor
+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
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
@@ -71,19 +80,42 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc Changes License.txt README
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/sshmenu
 %{ruby_sitelib}/sshmenu.rb
 %{_mandir}/man1/sshmenu.1*
 
+
+# On RHEL we are missing libs to get the gnome applet working (#463022)
+%if 0%{!?rhel: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
+%endif
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-2
+- Disable the gnome-applet-sshmenu sub-package on RHEL (#463022).
+
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.18-1
+- Update to 3.18.
+- Rebased both patches for the Makefile changes.
+- Fix scriplets by adding "|| :" for touch.
+- Include new bash_completion.d as-is since all packages seem to do it.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sat May  9 2009 Matthias Saou <http://freshrpms.net/> 3.16-1
+- Update to 3.16.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Jan 17 2008 Matthias Saou <http://freshrpms.net/> 3.15-5
 - Move gnome-sshmenu.rb to gnome-applet-sshmenu too.
 


--- sshmenu-3.15-libexec.patch DELETED ---


--- sshmenu-3.15-sitelib.patch DELETED ---

More information about the fedora-extras-commits mailing list