rpms/python-xlib/devel defs, NONE, 1.1 fix-rhomboid-examples, NONE, 1.1 fix-ssh-tunnel-auth, NONE, 1.1 fix-unix-socket-in-display, NONE, 1.1 increase-receiving-buffer, NONE, 1.1 .cvsignore, 1.3, 1.4 python-xlib.spec, 1.6, 1.7 sources, 1.3, 1.4
Jef Spaleta
jspaleta at fedoraproject.org
Mon Dec 14 23:22:10 UTC 2009
Author: jspaleta
Update of /cvs/pkgs/rpms/python-xlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3094
Modified Files:
.cvsignore python-xlib.spec sources
Added Files:
defs fix-rhomboid-examples fix-ssh-tunnel-auth
fix-unix-socket-in-display increase-receiving-buffer
Log Message:
* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15-0.1.rc1
- New upstream pre-release and some cherry picked patches from Debian from Fedora bug 537264
--- NEW FILE defs ---
# Definitions for documentation makefiles
SRCDIR = ../src
TOPSRC = $(SRCDIR)/python-xlib.texi
SRCS = $(TOPSRC) \
$(SRCDIR)/concepts.texi $(SRCDIR)/package.texi \
$(SRCDIR)/connect.texi $(SRCDIR)/errors.texi \
$(SRCDIR)/events.texi $(SRCDIR)/objects.texi
--- NEW FILE fix-rhomboid-examples ---
Index: trunk/examples/draw.py
===================================================================
--- trunk.orig/examples/draw.py 2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw.py 2009-11-05 06:06:25.000000000 -0500
@@ -115,7 +115,7 @@
sys.exit(0)
# A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
class Movement:
def __init__(self, win, ev):
@@ -129,7 +129,7 @@
self.time = ev.time
self.lines = [(ev.event_x, ev.event_y)]
- self.first = Romboid(self.win, ev)
+ self.first = Rhomboid(self.win, ev)
self.last = None
def motion(self, ev):
@@ -182,7 +182,7 @@
def finish(self, ev):
self.motion(ev)
if len(self.lines) > 1:
- self.last = Romboid(self.win, ev)
+ self.last = Rhomboid(self.win, ev)
self.left = min(ev.event_x - 5, self.left)
self.right = max(ev.event_x + 5, self.right)
@@ -204,8 +204,8 @@
self.last.draw()
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
def __init__(self, win, ev):
self.win = win
self.x = ev.event_x
@@ -213,7 +213,7 @@
self.draw()
def draw(self):
- # Draw the segments of the romboid
+ # Draw the segments of the rhomboid
self.win.window.poly_line(self.win.gc, X.CoordModePrevious,
[(self.x, self.y - 5),
(5, 5),
Index: trunk/examples/draw-proto.py
===================================================================
--- trunk.orig/examples/draw-proto.py 2009-04-11 19:18:15.000000000 -0400
+++ trunk/examples/draw-proto.py 2009-11-05 06:06:25.000000000 -0500
@@ -104,7 +104,7 @@
current.motion(e)
# A drawed objects, consisting of either a single
-# romboid, or two romboids connected by a winding line
+# rhomboid, or two rhomboids connected by a winding line
class Movement:
def __init__(self, win, ev):
@@ -118,7 +118,7 @@
self.time = ev.time
self.lines = [(ev.event_x, ev.event_y)]
- self.first = Romboid(self.win, ev)
+ self.first = Rhomboid(self.win, ev)
self.last = None
def motion(self, ev):
@@ -179,7 +179,7 @@
def finish(self, ev):
self.motion(ev)
if len(self.lines) > 1:
- self.last = Romboid(self.win, ev)
+ self.last = Rhomboid(self.win, ev)
self.left = min(ev.event_x - 5, self.left)
self.right = max(ev.event_x + 5, self.right)
@@ -203,8 +203,8 @@
self.last.draw()
-# A romboid, drawed around the Movement endpoints
-class Romboid:
+# A rhomboid, drawed around the Movement endpoints
+class Rhomboid:
def __init__(self, win, ev):
self.win = win
self.x = ev.event_x
@@ -212,7 +212,7 @@
self.draw()
def draw(self):
- # Draw the segments of the romboid
+ # Draw the segments of the rhomboid
PolyLine(self.win.d, None,
X.CoordModePrevious,
self.win.window,
--- NEW FILE fix-ssh-tunnel-auth ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py 2009-11-05 06:06:09.000000000 -0500
+++ trunk/Xlib/support/unix_connect.py 2009-11-05 06:06:23.000000000 -0500
@@ -161,6 +161,14 @@
except os.error:
pass
+ if not auth_data and host=='localhost':
+ # 127.0.0.1 counts as FamilyLocal, not FamilyInternet
+ # See Xtransutil.c:ConvertAddress.
+ # There might be more ways to spell 127.0.0.1 but
+ # 'localhost', yet this code fixes a the case of
+ # OpenSSH tunneling X.
+ return get_auth('unix:%d' % dno, 'unix', dno)
+
return auth_name, auth_data
get_auth = new_get_auth
--- NEW FILE fix-unix-socket-in-display ---
Index: trunk/Xlib/support/unix_connect.py
===================================================================
--- trunk.orig/Xlib/support/unix_connect.py 2008-07-23 11:33:36.000000000 -0400
+++ trunk/Xlib/support/unix_connect.py 2009-11-05 06:06:50.000000000 -0500
@@ -60,6 +60,8 @@
name = display
host = m.group(1)
+ if host == 'unix':
+ host = ''
dno = int(m.group(2))
screen = m.group(4)
if screen:
--- NEW FILE increase-receiving-buffer ---
Index: trunk/Xlib/protocol/display.py
===================================================================
--- trunk.orig/Xlib/protocol/display.py 2008-03-18 16:08:27.000000000 -0400
+++ trunk/Xlib/protocol/display.py 2009-11-05 06:06:15.000000000 -0500
@@ -533,7 +533,7 @@
# We're the recieving thread, parse the data
if recieving:
try:
- bytes_recv = self.socket.recv(2048)
+ bytes_recv = self.socket.recv(4096)
except socket.error, err:
self.close_internal('server: %s' % err[1])
raise self.socket_error
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 1 Jul 2008 19:54:48 -0000 1.3
+++ .cvsignore 14 Dec 2009 23:22:09 -0000 1.4
@@ -1 +1 @@
-python-xlib-0.14.tar.gz
+python-xlib-0.15rc1.tar.gz
Index: python-xlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/python-xlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-xlib.spec 27 Jul 2009 01:32:52 -0000 1.6
+++ python-xlib.spec 14 Dec 2009 23:22:10 -0000 1.7
@@ -1,17 +1,21 @@
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
+%define pre_release rc1
Name: python-xlib
-Version: 0.14
-Release: 5%{?dist}
+Version: 0.15
+Release: 0.1.%{pre_release}%{?dist}
Summary: X client library for Python
Group: Development/Languages
License: GPLv2+
URL: http://python-xlib.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}.tar.gz
+Source0: http://prdownloads.sourceforge.net/python-xlib/python-xlib-%{version}%{pre_release}.tar.gz
+Source1: defs
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch0: increase-receiving-buffer
+Patch1: fix-unix-socket-in-display
+Patch2: fix-ssh-tunnel-auth
+Patch3: fix-rhomboid-examples
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: texinfo-tex tetex-dvips
@@ -32,11 +36,15 @@ Install this package if you want the dev
that tell you how to program with python-xlib.
%prep
-%setup -q
-
+%setup -q -n %{name}-%{version}%{pre_release}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__python} setup.py build
+cp %{SOURCE1} doc/src/
cd doc
make html ps
cd html
@@ -63,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Dec 14 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15-0.1.rc1
+- New upstream pre-release and some cherry picked patches from Debian from Fedora bug 537264
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-xlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 1 Jul 2008 19:54:48 -0000 1.3
+++ sources 14 Dec 2009 23:22:10 -0000 1.4
@@ -1 +1 @@
-a038c2f410d8445f3fa8f6dcd45659c5 python-xlib-0.14.tar.gz
+7941e91bc3e92dc921dfc930cc8f7830 python-xlib-0.15rc1.tar.gz
More information about the fedora-extras-commits
mailing list