From b5c2805387c0e8150f1b0f8c9c1a0d3a6a3e9105 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Tue, 28 Feb 2017 16:50:10 -0700
Subject: Update to 0.19 Drop upstreamed patches
---
.gitignore | 1 +
fix-rhomboid-examples | 108 -----------------------------------
fix-unix-socket-in-display | 13 -----
python-xlib-0.15rc1-xauthority.patch | 25 --------
python-xlib-perl.patch | 21 -------
python-xlib.spec | 18 ++----
sources | 2 +-
7 files changed, 8 insertions(+), 180 deletions(-)
delete mode 100644 fix-rhomboid-examples
delete mode 100644 fix-unix-socket-in-display
delete mode 100644 python-xlib-0.15rc1-xauthority.patch
delete mode 100644 python-xlib-perl.patch
diff --git a/.gitignore b/.gitignore
index 6523dc0..34345da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
python-xlib-0.15rc1.tar.gz
/python-xlib-0.17.tar.gz
+/python-xlib-0.19.tar.gz
diff --git a/fix-rhomboid-examples b/fix-rhomboid-examples
deleted file mode 100644
index 427371f..0000000
--- a/fix-rhomboid-examples
+++ /dev/null
@@ -1,108 +0,0 @@
-commit c58d9d6e26a323e1525fb5683a0e3fbe1eee9c22
-Author: Orion Poplawski <orion(a)cora.nwra.com>
-Date: Fri Sep 30 15:49:39 2016 -0600
-
- Fix spelling of rhomboid
-
-diff --git a/examples/draw-proto.py b/examples/draw-proto.py
-index 3db1b99..4edc361 100755
---- a/examples/draw-proto.py
-+++ b/examples/draw-proto.py
-@@ -107,7 +107,7 @@ class Window(object):
- 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(object):
- def __init__(self, win, ev):
-@@ -121,7 +121,7 @@ class Movement(object):
- 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 @@ class Movement(object):
- 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)
-@@ -206,8 +206,8 @@ class Movement(object):
- self.last.draw()
-
-
--# A romboid, drawed around the Movement endpoints
--class Romboid(object):
-+# A rhomboid, drawed around the Movement endpoints
-+class Rhomboid(object):
- def __init__(self, win, ev):
- self.win = win
- self.x = ev.event_x
-@@ -215,7 +215,7 @@ class Romboid(object):
- 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,
-diff --git a/examples/draw.py b/examples/draw.py
-index 8832a50..f456d80 100755
---- a/examples/draw.py
-+++ b/examples/draw.py
-@@ -118,7 +118,7 @@ class Window(object):
- 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(object):
- def __init__(self, win, ev):
-@@ -132,7 +132,7 @@ class Movement(object):
- 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):
-@@ -185,7 +185,7 @@ class Movement(object):
- 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)
-@@ -207,8 +207,8 @@ class Movement(object):
- self.last.draw()
-
-
--# A romboid, drawed around the Movement endpoints
--class Romboid(object):
-+# A rhomboid, drawed around the Movement endpoints
-+class Rhomboid(object):
- def __init__(self, win, ev):
- self.win = win
- self.x = ev.event_x
-@@ -216,7 +216,7 @@ class Romboid(object):
- 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),
diff --git a/fix-unix-socket-in-display b/fix-unix-socket-in-display
deleted file mode 100644
index 5538464..0000000
--- a/fix-unix-socket-in-display
+++ /dev/null
@@ -1,13 +0,0 @@
-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:
diff --git a/python-xlib-0.15rc1-xauthority.patch b/python-xlib-0.15rc1-xauthority.patch
deleted file mode 100644
index 49109f9..0000000
--- a/python-xlib-0.15rc1-xauthority.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit c7473b12238cd1573bb4d7b45a117732f72cf60a
-Author: Orion Poplawski <orion(a)cora.nwra.com>
-Date: Fri Sep 30 15:52:43 2016 -0600
-
- Do not depend on the existence of ~/.Xauthority.
-
-
https://bugzilla.redhat.com/show_bug.cgi?id=552491
-
-diff --git a/Xlib/support/unix_connect.py b/Xlib/support/unix_connect.py
-index 0b7513a..677c36e 100644
---- a/Xlib/support/unix_connect.py
-+++ b/Xlib/support/unix_connect.py
-@@ -116,7 +116,11 @@ def new_get_auth(sock, dname, host, dno):
- family = xauth.FamilyLocal
- addr = socket.gethostname().encode()
-
-- au = xauth.Xauthority()
-+ try:
-+ au = xauth.Xauthority()
-+ except error.XauthError:
-+ return old_get_auth(sock, dname, host, dno)
-+
- while 1:
- try:
- return au.get_best_auth(family, addr, dno)
diff --git a/python-xlib-perl.patch b/python-xlib-perl.patch
deleted file mode 100644
index b6da7bd..0000000
--- a/python-xlib-perl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up python-xlib-0.15rc1/doc/html/texi2html.perl
python-xlib-0.15rc1/doc/html/texi2html
---- python-xlib-0.15rc1/doc/html/texi2html.perl 2009-05-28 08:39:08.000000000 -0600
-+++ python-xlib-0.15rc1/doc/html/texi2html 2015-06-19 16:10:01.334379104 -0600
-@@ -1557,7 +1557,7 @@ sub update_sec_num {
- $level--; # here we start at 0
- if ($name =~ /^appendix/) {
- # appendix style
-- if (defined(@appendix_sec_num)) {
-+ if (@appendix_sec_num) {
- &incr_sec_num($level, @appendix_sec_num);
- } else {
- @appendix_sec_num = ('A', 0, 0, 0);
-@@ -1565,7 +1565,7 @@ sub update_sec_num {
- $ret = join('.', @appendix_sec_num[0..$level]);
- } else {
- # normal style
-- if (defined(@normal_sec_num)) {
-+ if (@normal_sec_num) {
- &incr_sec_num($level, @normal_sec_num);
- } else {
- @normal_sec_num = (1, 0, 0, 0);
diff --git a/python-xlib.spec b/python-xlib.spec
index 9b9d7cc..a5cbb61 100644
--- a/python-xlib.spec
+++ b/python-xlib.spec
@@ -1,6 +1,6 @@
Name: python-xlib
-Version: 0.17
-Release: 3%{?dist}
+Version: 0.19
+Release: 1%{?dist}
Summary: X client library for Python
Group: Development/Languages
@@ -8,13 +8,7 @@ License: LGPLv2+
URL:
https://github.com/python-xlib/python-xlib
Source0:
https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}....
Patch0: increase-receiving-buffer
-Patch1: fix-unix-socket-in-display
Patch2: fix-ssh-tunnel-auth
-Patch3: fix-rhomboid-examples
-Patch4: python-xlib-0.15rc1-xauthority.patch
-# Fix perl usage
-#
https://sourceforge.net/p/python-xlib/bugs/41/
-Patch7: python-xlib-perl.patch
BuildArch: noarch
BuildRequires: texinfo-tex tetex-dvips
# For tests
@@ -62,11 +56,7 @@ that tell you how to program with python-xlib.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch7 -p1 -b .perl
%build
%py2_build
@@ -101,6 +91,10 @@ xvfb-run %__python3 setup.py test
%changelog
+* Tue Feb 28 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.19-1
+- Update to 0.19
+- Drop upstreamed patches
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.17-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index 16fe20f..d9b6633 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b883c34ea198095cc965be19bbba63ab python-xlib-0.17.tar.gz
+SHA512 (python-xlib-0.19.tar.gz) =
5d67c67964fce25c351b0da4ce13d2a59b64a0f5b7bd5281197dbea6df93062f1e089cfacfb36bc64177a21622076b5e3af82624a3d8b91a112be1adf1472c10
--
cgit v1.1
https://src.fedoraproject.org/cgit/python-xlib.git/commit/?h=master&i...