[python3-iep/f21] Update to 3.5
Scott K Logan
cottsay at fedoraproject.org
Sat Jan 17 20:42:35 UTC 2015
commit 81827b087b1b06d0049dd7cf61bfd97bc109bf05
Author: Scott K Logan <logans at cottsay.net>
Date: Tue Jul 15 13:29:09 2014 -0500
Update to 3.5
.gitignore | 1 +
iep-3.4-font-dir.patch | 33 ----------------------------
iep-3.5-import-wizard-pyqt4.patch | 39 ++++++++++++++++++++++++++++++++++
iep-3.5-previous-tab-selection.patch | 34 +++++++++++++++++++++++++++++
iep-3.5-remove-entry-points.patch | 11 +++++++++
python3-iep.spec | 22 +++++++++++++++---
sources | 2 +-
7 files changed, 104 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2937e99..8da8db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/iep-3.4.tar.gz
+/iep-3.5.tar.gz
diff --git a/iep-3.5-import-wizard-pyqt4.patch b/iep-3.5-import-wizard-pyqt4.patch
new file mode 100644
index 0000000..9d26a50
--- /dev/null
+++ b/iep-3.5-import-wizard-pyqt4.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User Scott K Logan <logans at cottsay.net>
+# Date 1421263370 28800
+# Node ID ab022aca08742a8aee48dc1e02c55178e1b84c67
+# Parent a0fbe0e7a48fe074f7832223cf372f8fe2137bce
+Remove a stray PySide import
+
+diff --git a/iep/tools/iepFileBrowser/importwizard.py b/iep/tools/iepFileBrowser/importwizard.py
+--- a/iep/tools/iepFileBrowser/importwizard.py
++++ b/iep/tools/iepFileBrowser/importwizard.py
+@@ -21,7 +21,6 @@
+
+ """
+
+-from PySide import QtGui, QtCore
+ import os
+ import itertools
+ import iep.codeeditor
+# HG changeset patch
+# User Scott K Logan <logans at cottsay.net>
+# Date 1421263442 28800
+# Node ID 8b9bdd5c77ce34dc1e389d2621700063507ba7e5
+# Parent ab022aca08742a8aee48dc1e02c55178e1b84c67
+Use setText to set the initial value of fname
+
+QLineEdit doesn't have a text attribute in PyQt4
+
+diff --git a/iep/tools/iepFileBrowser/importwizard.py b/iep/tools/iepFileBrowser/importwizard.py
+--- a/iep/tools/iepFileBrowser/importwizard.py
++++ b/iep/tools/iepFileBrowser/importwizard.py
+@@ -536,7 +536,7 @@
+ return
+
+ self.restart()
+- self.setField('fname', filename)
++ self.selectFilePage.txtFilename.setText(filename)
+ self.selectFilePage.updatePreview()
+ self.show()
+
diff --git a/iep-3.5-previous-tab-selection.patch b/iep-3.5-previous-tab-selection.patch
new file mode 100644
index 0000000..97ec1c0
--- /dev/null
+++ b/iep-3.5-previous-tab-selection.patch
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Scott K Logan <logans at cottsay.net>
+# Date 1415482316 28800
+# Node ID 1013bb47ac751cbfba95ea8e64dc1296ffa033ed
+# Parent d8efc8c3d455788c9a15d97f87655399d1341c5b
+Fix previous tab selection without history
+
+diff --git a/iep/iepcore/editorTabs.py b/iep/iepcore/editorTabs.py
+--- a/iep/iepcore/editorTabs.py
++++ b/iep/iepcore/editorTabs.py
+@@ -685,7 +685,7 @@
+ """
+
+ if isinstance(item, int):
+- self.setCurrentIndex(i)
++ self.setCurrentIndex(item)
+
+ elif isinstance(item, FileItem):
+
+@@ -711,12 +711,12 @@
+ """ Select the previously selected item. """
+
+ # make an old item history
+- if len(self._itemHistory)>1:
++ if len(self._itemHistory)>1 and self._itemHistory[1] is not None:
+ item = self._itemHistory[1]
+ self.setCurrentItem(item)
+
+ # just select first one then ...
+- elif item is None and self.count():
++ elif self.count():
+ item = 0
+ self.setCurrentItem(item)
+
diff --git a/iep-3.5-remove-entry-points.patch b/iep-3.5-remove-entry-points.patch
new file mode 100644
index 0000000..9972a65
--- /dev/null
+++ b/iep-3.5-remove-entry-points.patch
@@ -0,0 +1,11 @@
+diff -uNr a/setup.py b/setup.py
+--- a/setup.py 2014-04-29 09:26:58.000000000 -0500
++++ b/setup.py 2014-07-15 14:46:24.733876175 -0500
+@@ -77,7 +77,4 @@
+ 'Operating System :: POSIX',
+ 'Programming Language :: Python :: 3',
+ ],
+-
+- entry_points = {'console_scripts': ['iep = ieplauncher',],
+- },
+ )
diff --git a/python3-iep.spec b/python3-iep.spec
index f0e039c..7c85d97 100644
--- a/python3-iep.spec
+++ b/python3-iep.spec
@@ -1,6 +1,6 @@
Name: python3-iep
-Version: 3.4
-Release: 4%{?dist}
+Version: 3.5
+Release: 1%{?dist}
Summary: The interactive editor for Python
Group: Development/Tools
@@ -8,7 +8,11 @@ License: BSD
URL: http://www.iep-project.org/
Source0: https://pypi.python.org/packages/source/i/iep/iep-%{version}.tar.gz
Source1: iep.desktop
-Patch0: iep-3.4-font-dir.patch
+Patch0: iep-3.5-remove-entry-points.patch
+# Applied upstream
+Patch1: iep-3.5-previous-tab-selection.patch
+# Applied upstream
+Patch2: iep-3.5-import-wizard-pyqt4.patch
BuildArch: noarch
@@ -18,6 +22,7 @@ Requires: python3-PyQt4
Requires: python3-pyzolib
BuildRequires: desktop-file-utils
BuildRequires: python3-devel
+BuildRequires: python3-setuptools
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -28,7 +33,9 @@ practical design is aimed at simplicity and efficiency.
%prep
%setup -qn iep-%{version}
-%patch0 -p1
+%patch0 -p1 -b .remove-entry-points
+%patch1 -p1 -b .previous-tab-selection
+%patch2 -p1 -b .import-wizard-pyqt4
# Remove bundled fonts
rm -rf iep/resources/fonts
@@ -84,6 +91,13 @@ fi
%{_datadir}/applications/iep.desktop
%changelog
+* Sat Jan 17 2015 Scott K Logan <logans at cottsay.net> - 3.5-1
+- Update to 3.5
+- Remove console script until it is fixed upstream
+- Add BuildRequires python3-setuptools
+- Add upstream patch to fix previous tab selection RHBZ#1161856
+- Add upstream patch to fix the import wizard RHBZ#1181827
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 4a09dc5..c4331a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-253774cd8d508d78eeb61dee422a32ea iep-3.4.tar.gz
+5bd4376e5fecd9b83baac89a556a92d1 iep-3.5.tar.gz
More information about the scm-commits
mailing list