From 97e8b8c035d346dfc59da31afc67ddeb874e80e5 Mon Sep 17 00:00:00 2001 From: Paul P. Komkoff Date: Mar 08 2015 16:47:30 +0000 Subject: New upstream version 2.7 --- diff --git a/.gitignore b/.gitignore index dee9e95..15396dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pyserial-2.4.tar.gz /pyserial-2.5.tar.gz /pyserial-2.6.tar.gz +/pyserial-2.7.tar.gz diff --git a/pyserial-speed.patch b/pyserial-speed.patch deleted file mode 100644 index bb8f834..0000000 --- a/pyserial-speed.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: pyserial/serial/serialposix.py -=================================================================== ---- pyserial/serial/serialposix.py (revision 455) -+++ pyserial/serial/serialposix.py (working copy) -@@ -36,26 +36,25 @@ - def device(port): - return '/dev/ttyS%d' % port - -- ASYNC_SPD_MASK = 0x1030 -- ASYNC_SPD_CUST = 0x0030 -+ TCGETS2 = 0x802C542A -+ TCSETS2 = 0x402C542B -+ BOTHER = 0o010000 - - def set_special_baudrate(port, baudrate): -+ # right size is 44 on x86_64, allow for some growth - import array -- buf = array.array('i', [0] * 32) -+ buf = array.array('i', [0] * 64) - - # get serial_struct -- FCNTL.ioctl(port.fd, TERMIOS.TIOCGSERIAL, buf) -+ FCNTL.ioctl(port.fd, TCGETS2, buf) -+ # set custom speed -+ buf[2] &= ~TERMIOS.CBAUD -+ buf[2] |= BOTHER -+ buf[9] = buf[10] = baudrate - -- # set custom divisor -- buf[6] = buf[7] / baudrate -- -- # update flags -- buf[4] &= ~ASYNC_SPD_MASK -- buf[4] |= ASYNC_SPD_CUST -- - # set serial_struct - try: -- res = FCNTL.ioctl(port.fd, TERMIOS.TIOCSSERIAL, buf) -+ res = FCNTL.ioctl(port.fd, TCSETS2, buf) - except IOError: - raise ValueError('Failed to set custom baud rate: %r' % baudrate) - diff --git a/pyserial.spec b/pyserial.spec index 38a3e12..0388a22 100644 --- a/pyserial.spec +++ b/pyserial.spec @@ -1,9 +1,8 @@ Summary: Python serial port access library Name: pyserial -Version: 2.6 -Release: 9%{?dist} +Version: 2.7 +Release: 1%{?dist} Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Patch0: pyserial-speed.patch License: Python Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +30,6 @@ the appropriate backend. %prep export UNZIP="-aa" %setup -q -%patch0 -p1 rm -rf %{py3dir} cp -a . %{py3dir} @@ -62,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{python3_sitelib}/* %changelog +* Sun Mar 08 2015 Paul Komkoff 2.7-1 +- new upstream version + * Sat Jun 07 2014 Fedora Release Engineering - 2.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 3fb37dd..2cfe460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cde799970b7c1ce1f7d6e9ceebe64c98 pyserial-2.6.tar.gz +794506184df83ef2290de0d18803dd11 pyserial-2.7.tar.gz