From 15ff6e1ae4a090dd7a1bd53f5e48f9d579135386 Mon Sep 17 00:00:00 2001
From: Terje Røsten <terje.rosten@ntnu.no>
Date: May 13 2016 18:19:45 +0000
Subject: 1.7.0


---

diff --git a/.gitignore b/.gitignore
index 0b46c86..71187cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mycli-1.5.2.tar.gz
 /mycli-1.6.0.tar.gz
+/mycli-1.7.0.tar.gz
diff --git a/mycli-1.6.0-mv-authors.patch b/mycli-1.6.0-mv-authors.patch
deleted file mode 100644
index 3e1a514..0000000
--- a/mycli-1.6.0-mv-authors.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/mycli/main.py b/mycli/main.py
-index e423aa7..7c3cd75 100755
---- a/mycli/main.py
-+++ b/mycli/main.py
-@@ -414,7 +414,7 @@ class MyCli(object):
-                 value = 'emacs'
-             self.key_bindings = value
- 
--        project_root = os.path.dirname(PACKAGE_ROOT)
-+        project_root = os.path.join(os.path.dirname(PACKAGE_ROOT), 'mycli')
-         author_file = os.path.join(project_root, 'AUTHORS')
-         sponsor_file = os.path.join(project_root, 'SPONSORS')
- 
-diff --git a/setup.py b/setup.py
-index a5eec5e..35d6e38 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,7 @@ setup(
-         version=version,
-         url='http://mycli.net',
-         packages=find_packages(),
--        package_data={'mycli': ['myclirc', '../AUTHORS', '../SPONSORS']},
-+        package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']},
-         description=description,
-         long_description=description,
-         install_requires=install_requirements,
diff --git a/mycli-1.7.0-mv-authors.patch b/mycli-1.7.0-mv-authors.patch
new file mode 100644
index 0000000..ca87c6f
--- /dev/null
+++ b/mycli-1.7.0-mv-authors.patch
@@ -0,0 +1,26 @@
+diff --git a/mycli/main.py b/mycli/main.py
+index cc42d6e..8d816ce 100755
+--- a/mycli/main.py
++++ b/mycli/main.py
+@@ -420,7 +420,7 @@ class MyCli(object):
+ 
+         self.refresh_completions()
+ 
+-        project_root = os.path.dirname(PACKAGE_ROOT)
++        project_root = os.path.join(os.path.dirname(PACKAGE_ROOT), 'mycli')
+         author_file = os.path.join(project_root, 'AUTHORS')
+         sponsor_file = os.path.join(project_root, 'SPONSORS')
+ 
+diff --git a/setup.py b/setup.py
+index 1876c6a..31e7ac8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@ setup(
+         version=version,
+         url='http://mycli.net',
+         packages=find_packages(),
+-        package_data={'mycli': ['myclirc', '../AUTHORS', '../SPONSORS']},
++        package_data={'mycli': ['myclirc', 'AUTHORS', 'SPONSORS']},
+         description=description,
+         long_description=description,
+         install_requires=install_requirements,
diff --git a/mycli-1.7.0-sqlparse.patch b/mycli-1.7.0-sqlparse.patch
new file mode 100644
index 0000000..63d30a9
--- /dev/null
+++ b/mycli-1.7.0-sqlparse.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 31e7ac8..22c0e6b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ install_requirements = [
+     'Pygments >= 2.0',  # Pygments has to be Capitalcased. WTF?
+     'prompt_toolkit>=1.0.0,<1.1.0',
+     'PyMySQL >= 0.6.2',
+-    'sqlparse >= 0.1.19',
++    'sqlparse >= 0.1.18',
+     'configobj >= 5.0.6',
+ ]
+ 
diff --git a/mycli.spec b/mycli.spec
index 4085b7b..fb9be3a 100644
--- a/mycli.spec
+++ b/mycli.spec
@@ -1,20 +1,21 @@
 Summary:        Interactive CLI for MySQL Database with auto-completion and syntax highlighting
 Name:           mycli
-Version:        1.6.0
+Version:        1.7.0
 Release:        1%{?dist}
 License:        BSD
-URL:            http://%{name}.net
-Source0:        https://pypi.python.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
-Patch01:        %{name}-1.6.0-mv-authors.patch
+URL:            http://mycli.net
+Source0:        https://pypi.python.org/packages/source/m/mycli/mycli-%{version}.tar.gz
+Patch01:        mycli-1.7.0-mv-authors.patch
+Patch02:        mycli-1.7.0-sqlparse.patch
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-Requires:       python3-click >= 4.0
+Requires:       python3-click >= 4.1
 requires:       python3-crypto => 2.6.1
 Requires:       python3-pygments >= 2.0
-Requires:       python3-prompt_toolkit = 0.60
-Requires:       python3-PyMySQL >= 0.6.6
-Requires:       python3-sqlparse >= 0.1.16
+Requires:       python3-prompt_toolkit >= 1.0.0
+Requires:       python3-PyMySQL >= 0.6.2
+Requires:       python3-sqlparse >= 0.1.18
 Requires:       python3-configobj >= 5.0.6
 Requires:       python3-setuptools
 %description
@@ -24,9 +25,10 @@ syntax highlighting.
 %prep
 %setup -q
 %patch01 -p1
-rm -rf %{name}.egg-info
-mv AUTHORS SPONSORS %{name}/
-sed -i -e '1 d' %{name}/main.py
+%patch02 -p1
+rm -rf mycli.egg-info
+mv AUTHORS SPONSORS mycli/
+sed -i -e '1 d' mycli/main.py
 
 %build
 %{py3_build}
@@ -36,12 +38,15 @@ sed -i -e '1 d' %{name}/main.py
 
 %files
 %license LICENSE.txt
-%doc %{name}/AUTHORS README.md %{name}/SPONSORS
-%{_bindir}/%{name}
-%{python3_sitelib}/%{name}
-%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
+%doc mycli/AUTHORS README.md mycli/SPONSORS
+%{_bindir}/mycli
+%{python3_sitelib}/mycli
+%{python3_sitelib}/mycli-%{version}-py?.?.egg-info
 
 %changelog
+* Fri May 13 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.7.0-1
+- 1.7.0
+
 * Sun Mar 27 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.6.0-1
 - 1.6.0
 
diff --git a/sources b/sources
index 5ba4fa4..43b8a3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-390ce1ae5b8f9ddca95fb1aa54e2eab2  mycli-1.6.0.tar.gz
+8d450538ec991392d6c9f86f5e3ddd6d  mycli-1.7.0.tar.gz