rpms/tsclient/devel icon-names.patch, NONE, 1.1 launch-args.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tsclient.spec, 1.29, 1.30

Tue Aug 12 04:24:34 UTC 2008

Author: mclasen

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

Modified Files:
	.cvsignore sources tsclient.spec 
Added Files:
	icon-names.patch launch-args.patch 
Log Message:
2.0.1


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up tsclient-2.0.1/src/plugins/default/tsc-generic-provider.c.icon-names tsclient-2.0.1/src/plugins/default/tsc-generic-provider.c
--- tsclient-2.0.1/src/plugins/default/tsc-generic-provider.c.icon-names	2008-05-09 16:22:54.000000000 -0400
+++ tsclient-2.0.1/src/plugins/default/tsc-generic-provider.c	2008-08-12 00:16:20.000000000 -0400
@@ -34,7 +34,7 @@ tsc_generic_provider_init (TSCGenericPro
 	parent->name = "Generic";
 	parent->display_name = _("Custom Command");
 	parent->description = _("Create a generic freeform connection");
-	parent->icon_name = "gnome-run";
+	parent->icon_name = "system-run";
 	parent->enabled = TRUE;
 }
 
diff -up tsclient-2.0.1/src/plugins/default/tsc-ssh-provider.c.icon-names tsclient-2.0.1/src/plugins/default/tsc-ssh-provider.c
--- tsclient-2.0.1/src/plugins/default/tsc-ssh-provider.c.icon-names	2008-05-20 12:50:13.000000000 -0400
+++ tsclient-2.0.1/src/plugins/default/tsc-ssh-provider.c	2008-08-12 00:16:20.000000000 -0400
@@ -35,7 +35,7 @@ tsc_ssh_provider_init (TSCSshProvider *p
 	parent->name = "SSH";
 	parent->display_name = _("SSH");
 	parent->description = _("Create an ssh connection");
-	parent->icon_name = "gnome-fs-ssh";
+	parent->icon_name = "folder-remote-ssh";
 	parent->enabled = tsc_util_program_exists ("ssh");
 }
 
diff -up tsclient-2.0.1/src/plugins/default/tsc-vnc-provider.c.icon-names tsclient-2.0.1/src/plugins/default/tsc-vnc-provider.c
--- tsclient-2.0.1/src/plugins/default/tsc-vnc-provider.c.icon-names	2008-05-09 16:22:54.000000000 -0400
+++ tsclient-2.0.1/src/plugins/default/tsc-vnc-provider.c	2008-08-12 00:16:20.000000000 -0400
@@ -64,7 +64,7 @@ tsc_vnc_provider_init (TSCVncProvider *p
 	parent->name = "VNC";
 	parent->display_name = _("VNC");
 	parent->description = _("Create a VNC connection");
-	parent->icon_name = "gnome-remote-desktop";
+	parent->icon_name = "preferences-desktop-remote-desktop";
 	parent->enabled = tsc_util_program_exists ("vncviewer");
 }
 
diff -up tsclient-2.0.1/src/tsc-util.c.icon-names tsclient-2.0.1/src/tsc-util.c
--- tsclient-2.0.1/src/tsc-util.c.icon-names	2008-05-06 09:30:05.000000000 -0400
+++ tsclient-2.0.1/src/tsc-util.c	2008-08-12 00:16:20.000000000 -0400
@@ -186,7 +186,7 @@ tsc_util_get_icon (const char *name, int
 	GtkIconTheme *theme;
 
 	theme = gtk_icon_theme_get_default ();
-	return gtk_icon_theme_load_icon (theme, name, size, 0, NULL);
+	return gtk_icon_theme_load_icon (theme, name, size, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 }
 
 TSCUserLevel
diff -up tsclient-2.0.1/src/tsc-window.c.icon-names tsclient-2.0.1/src/tsc-window.c
--- tsclient-2.0.1/src/tsc-window.c.icon-names	2008-08-12 00:18:54.000000000 -0400
+++ tsclient-2.0.1/src/tsc-window.c	2008-08-12 00:19:03.000000000 -0400
@@ -248,6 +248,7 @@ tsc_window_create_connection_menu (TSCWi
 	GtkWidget *item;
 	GtkImage *image;
 	const GList *l;
+	GIcon *gicon;
 	
 	menu = gtk_menu_new ();
 
@@ -264,8 +265,10 @@ tsc_window_create_connection_menu (TSCWi
 		}
 		
 		item = gtk_image_menu_item_new_with_label (tsc_provider_get_display_name (provider));
-		image = GTK_IMAGE (gtk_image_new_from_icon_name (tsc_provider_get_icon_name (provider),
-						      GTK_ICON_SIZE_MENU));
+		gicon = g_themed_icon_new_with_default_fallbacks (tsc_provider_get_icon_name (provider));
+		image = GTK_IMAGE (gtk_image_new_from_gicon (gicon,
+						             GTK_ICON_SIZE_MENU));
+		g_object_unref (gicon);
 
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), GTK_WIDGET (image));
 		

launch-args.patch:

--- NEW FILE launch-args.patch ---
diff -up tsclient-2.0.1/data/tsclient.desktop.in.launch-args tsclient-2.0.1/data/tsclient.desktop.in
--- tsclient-2.0.1/data/tsclient.desktop.in.launch-args	2008-08-11 23:51:56.000000000 -0400
+++ tsclient-2.0.1/data/tsclient.desktop.in	2008-08-11 23:52:21.000000000 -0400
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Terminal Server Client
 _GenericName=Terminal Server Client
 _Comment=Setup and initiate remote connections
-Exec=tsclient -s %u
+Exec=tsclient 
 Icon=tsclient
 StartupNotify=true
 Terminal=false


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tsclient/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Jun 2007 03:27:45 -0000	1.7
+++ .cvsignore	12 Aug 2008 04:24:04 -0000	1.8
@@ -1 +1 @@
-tsclient-0.150.tar.gz
+tsclient-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tsclient/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Jun 2007 03:27:45 -0000	1.7
+++ sources	12 Aug 2008 04:24:04 -0000	1.8
@@ -1 +1 @@
-1dc95fbdbcf4344d05114e1f43bf32ea  tsclient-0.150.tar.gz
+3de7131156f37c5ef1028a5f03ed021b  tsclient-2.0.1.tar.bz2


Index: tsclient.spec
===================================================================
RCS file: /cvs/extras/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tsclient.spec	4 May 2008 22:53:11 -0000	1.29
+++ tsclient.spec	12 Aug 2008 04:24:04 -0000	1.30
@@ -7,10 +7,10 @@
 
 Summary: Client for VNC and Windows Terminal Server
 Name: tsclient
-Version: 0.150
-Release: 7%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 URL: http://sourceforge.net/projects/tsclient
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 
 License: GPL+
 Group: User Interface/X
@@ -26,15 +26,28 @@
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser)
 
-Patch0: quick-pick.patch
+# reported upstream
+Patch0: icon-names.patch
+# reported upstream
+Patch1: launch-args.patch
 
 %description
 tsclient is a frontend that makes it easy to use rdesktop and vncviewer.
 You will need to install rdesktop or vnc in addition to tsclient.
 
+%package devel
+Summary: Header files needed to write tsclient plugins
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The tsclient-devel package contains header files that are needed to
+develop tsclient plugins.
+
 %prep
 %setup -q
-%patch0 -p1 -b .quick-pick
+%patch0 -p1 -b .icon-names
+%patch1 -p1 -b .launch-args
 
 %build
 
@@ -44,7 +57,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -54,24 +67,59 @@
   --add-category Utility 	                              \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
+rm -rf $RPM_BUILD_ROOT/usr/lib/tsclient/plugins/*.{a,la}
+
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post 
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/tsc-handlers.schemas >& /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/tsc-handlers.schemas >& /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/tsc-handlers.schemas >& /dev/null || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
-
+%doc COPYING AUTHORS
 %{_bindir}/*
-%{_datadir}/pixmaps/*
-%{_datadir}/application-registry/*.applications
-%{_datadir}/mime-info/tsclient*
-%{_mandir}/man*/*
 %{_datadir}/applications/*.desktop
-%{_libdir}/bonobo/servers/GNOME_TSClientApplet.server
-%{_libexecdir}/tsclient-applet
+%{_sysconfdir}/gconf/schemas/tsc-handlers.schemas
+%{_libdir}/tsclient
+%{_datadir}/gnome/autostart/tsc-autostart.desktop
+%{_datadir}/icons/hicolor/scalable/apps/tsclient.svg
+%{_datadir}/tsclient
+
+%files devel
+%{_includedir}/tsclient
+
 
 %changelog
+* Mon Aug 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.0.1-1
+- Update to 2.0.1
+
 * Sun May  4 2008 Matthias Clasen <mclasen at redhat.com> - 0.150-7
 - Fix source url
 


