From 239e431250307e6b22e4314d208b857fcf716401 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jun 18 2019 21:34:28 +0000
Subject: Fixed configure dialog traceback

Unified names of patches

---

diff --git a/python-pyobd-0.9.3-configure-dialog-traceback-fix.patch b/python-pyobd-0.9.3-configure-dialog-traceback-fix.patch
new file mode 100644
index 0000000..9477057
--- /dev/null
+++ b/python-pyobd-0.9.3-configure-dialog-traceback-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/pyobd b/pyobd
+index 9852fac..e015105 100755
+--- a/pyobd
++++ b/pyobd
+@@ -594,7 +594,7 @@ the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  0211
+         available = []
+         for i in range(256):
+           try: #scan standart ttyS*
+-            s = serial.Serial(i)
++            s = serial.Serial("/dev/ttyS"+str(i))
+             available.append(s.portstr)
+             s.close()   # explicit close 'cause of delayed GC in java
+           except serial.SerialException:
diff --git a/python-pyobd-0.9.3-fix-invalid-device-traceback.patch b/python-pyobd-0.9.3-fix-invalid-device-traceback.patch
deleted file mode 100644
index 5e1f88f..0000000
--- a/python-pyobd-0.9.3-fix-invalid-device-traceback.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/obd_io.py b/obd_io.py
-index a20a0a5..e30f103 100755
---- a/obd_io.py
-+++ b/obd_io.py
-@@ -84,11 +84,12 @@ class OBDPort:
-          self._notify_window=_notify_window
-          wx.PostEvent(self._notify_window, DebugEvent([1,"Opening interface (serial port)"]))                
- 
-+         self.port = None
-          try:
-              self.port = serial.Serial(portnum,baud, \
-              parity = par, stopbits = sb, bytesize = databits,timeout = to)
-              
--         except serial.SerialException:
-+         except (serial.SerialException, OSError):
-              self.State = 0
-              return None
-              
diff --git a/python-pyobd-0.9.3-invalid-device-traceback-fix.patch b/python-pyobd-0.9.3-invalid-device-traceback-fix.patch
new file mode 100644
index 0000000..5e1f88f
--- /dev/null
+++ b/python-pyobd-0.9.3-invalid-device-traceback-fix.patch
@@ -0,0 +1,18 @@
+diff --git a/obd_io.py b/obd_io.py
+index a20a0a5..e30f103 100755
+--- a/obd_io.py
++++ b/obd_io.py
+@@ -84,11 +84,12 @@ class OBDPort:
+          self._notify_window=_notify_window
+          wx.PostEvent(self._notify_window, DebugEvent([1,"Opening interface (serial port)"]))                
+ 
++         self.port = None
+          try:
+              self.port = serial.Serial(portnum,baud, \
+              parity = par, stopbits = sb, bytesize = databits,timeout = to)
+              
+-         except serial.SerialException:
++         except (serial.SerialException, OSError):
+              self.State = 0
+              return None
+              
diff --git a/python-pyobd.spec b/python-pyobd.spec
index 84cbce2..14a4293 100644
--- a/python-pyobd.spec
+++ b/python-pyobd.spec
@@ -6,7 +6,7 @@
 
 Name:           python-%{srcname}
 Version:        %{ver}
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        OBD-II (SAE-J1979) compliant scan tool software
 # CC-BY-SA for icon, see README.Fedora for details
 License:        GPLv2+ and CC-BY-SA
@@ -19,7 +19,8 @@ Source2:        README.Fedora
 BuildArch:      noarch
 # import from pyobd module
 Patch0:         python-pyobd-0.9.3-pyobd-module.patch
-Patch1:         python-pyobd-0.9.3-fix-invalid-device-traceback.patch
+Patch1:         python-pyobd-0.9.3-invalid-device-traceback-fix.patch
+Patch2:         python-pyobd-0.9.3-configure-dialog-traceback-fix.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix, ImageMagick
 
@@ -68,7 +69,8 @@ done
 sed -i '1 s|/usr/bin/env python|%{__python2}|' pyobd
 
 %patch0 -p1 -b .pyobd-module
-%patch1 -p1 -b .0.9.3-fix-invalid-device-traceback
+%patch1 -p1 -b .invalid-device-traceback-fix
+%patch2 -p1 -b .configure-dialog-traceback-fix
 
 %build
 
@@ -97,6 +99,10 @@ desktop-file-install --add-category="Utility" \
 %{_bindir}/pyobd
 
 %changelog
+* Tue Jun 18 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 0.9.3-16
+- Fixed configure dialog traceback
+- Unified names of patches
+
 * Mon Mar 25 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 0.9.3-15
 - Fixed requires
   Resolves: rhbz#1692145