rpms/tsclient/devel tsclient-glade-ids.patch, NONE, 1.1 tsclient.spec, 1.43, 1.44
Matthias Clasen
mclasen at fedoraproject.org
Sat Jun 13 03:50:30 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/tsclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2237
Modified Files:
tsclient.spec
Added Files:
tsclient-glade-ids.patch
Log Message:
Drop unneeded direct deps
tsclient-glade-ids.patch:
--- NEW FILE tsclient-glade-ids.patch ---
diff -up tsclient-2.0.2/data/tsclient.glade.wrong-glade-ids tsclient-2.0.2/data/tsclient.glade
--- tsclient-2.0.2/data/tsclient.glade.wrong-glade-ids 2009-04-22 01:16:55.614002504 -0400
+++ tsclient-2.0.2/data/tsclient.glade 2009-04-22 01:17:01.264040184 -0400
@@ -503,7 +503,6 @@ Prompt For Reconnect After Error</proper
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">rdp_fullscreen_radio</property>
</widget>
<packing>
<property name="top_attach">5</property>
@@ -915,7 +914,6 @@ LAN</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">vnc_fullscreen_radio</property>
</widget>
<packing>
<property name="top_attach">4</property>
@@ -992,7 +990,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="password_entry1">
+ <widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
@@ -1019,7 +1017,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_entry1">
+ <widget class="GtkEntry" id="host_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
@@ -1253,7 +1251,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_entry2">
+ <widget class="GtkEntry" id="host_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
@@ -1422,7 +1420,6 @@ LAN</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <property name="group">xdmcp_fullscreen_radio</property>
</widget>
<packing>
<property name="top_attach">2</property>
@@ -1449,7 +1446,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_entry3">
+ <widget class="GtkEntry" id="host_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
@@ -1565,7 +1562,7 @@ LAN</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="password_entry2">
+ <widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
@@ -1672,7 +1669,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="terminal_checkbox1">
+ <widget class="GtkCheckButton" id="terminal_checkbox">
<property name="label" translatable="yes">Run in terminal window</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1687,7 +1684,7 @@ LAN</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="host_entry4">
+ <widget class="GtkEntry" id="host_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
Index: tsclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tsclient/devel/tsclient.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- tsclient.spec 25 Feb 2009 22:02:11 -0000 1.43
+++ tsclient.spec 13 Jun 2009 03:50:00 -0000 1.44
@@ -8,13 +8,13 @@
Summary: Client for VNC and Windows Terminal Server
Name: tsclient
Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://sourceforge.net/projects/tsclient
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
License: GPL+
Group: User Interface/X
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rdesktop >= %{rdesktop_version}
Requires: vnc >= %{vnc_version}
@@ -41,6 +41,7 @@ Patch4: vnc-remote-screen-size.patch
# realvnc and tightvnc
Patch5: realvnc-args.patch
Patch6: tsclient-libgnomeui.patch
+Patch7: tsclient-glade-ids.patch
%description
tsclient is a frontend that makes it easy to use rdesktop and vncviewer.
@@ -62,12 +63,18 @@ develop tsclient plugins.
%patch4 -p1 -b .vnc-remotesize
%patch5 -p1 -b .realvnc-args
%patch6 -p1 -b .libgnomeui
+%patch7 -p1 -b .glade-ids
libtoolize --force --copy
autoreconf
%build
%configure
+
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
make %{?_smp_mflags}
%install
@@ -89,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT/usr/lib/tsclient/
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%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
@@ -132,6 +139,10 @@ fi
%changelog
+* Fri Jun 12 2009 Matthias Clasen <mclasen at redhat.com> - 2.0.2-3
+- Fix some wrong ids in the glade file to make the ui work (#485976)
+- Drop unneeded direct deps
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list