diff --git a/GitPython-2.0.8.tar.gz b/GitPython-2.0.8.tar.gz
deleted file mode 100644
index bf6deb2..0000000
--- a/GitPython-2.0.8.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222
-size 407438
diff --git a/GitPython-2.1.8.tar.gz b/GitPython-2.1.8.tar.gz
new file mode 100644
index 0000000..f73a6b9
--- /dev/null
+++ b/GitPython-2.1.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad61bc25deadb535b047684d06f3654c001d9415e1971e51c9c20f5b510076e9
+size 431074
diff --git a/python-GitPython.changes b/python-GitPython.changes
index a2795e7..2dfa92f 100644
--- a/python-GitPython.changes
+++ b/python-GitPython.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Jan 17 16:12:22 UTC 2018 - toddrme2178@gmail.com
+
+- Implement single-spec version
+- Update to version 2.1.8
+  * bugfixes
+- Update to version 2.1.6
+  * bugfixes
+  * support for worktrees
+- Update to version 2.1.3
+  * bugfixes
+- Update to version 2.1.1
+  * bugfixes
+- Update to version 2.1.0
+  * Much better windows support!
+  * The `GIT_DIR` environment variable does not override the `path` argument when
+    initializing a `Repo` object anymore. However, if said `path` unset, `GIT_DIR`
+    will be used to fill the void.
+- Update to version 2.0.9
+  * Bugfixes
+  * `tag.commit` will now resolve commits deeply.
+  * `Repo` objects can now be pickled, which helps with multi-processing.
+  * `Head.checkout()` now deals with detached heads, which is when it will return
+    the `HEAD` reference instead.
+  * `DiffIndex.iter_change_type(...)` produces better results when diffing
+
 -------------------------------------------------------------------
 Wed Aug 31 17:27:54 UTC 2016 - dmueller@suse.com
 
diff --git a/python-GitPython.spec b/python-GitPython.spec
index a7afc18..31ddcf8 100644
--- a/python-GitPython.spec
+++ b/python-GitPython.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-GitPython
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,27 +16,34 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# Requires test files missing from the pypi source archive
+%bcond_with     test
 Name:           python-GitPython
-Version:        2.0.8
+Version:        2.1.8
 Release:        0
-Url:            https://github.com/gitpython-developers/GitPython
 Summary:        Python Git Library
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         https://pypi.python.org/packages/source/G/GitPython/GitPython-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-gitdb >= 0.6.4
-BuildRequires:  python-setuptools
-Requires:       git-core
-Requires:       python-gitdb >= 0.6.4
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-BuildRequires:  python-ordereddict
-Requires:       python-ordereddict
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
+Url:            https://github.com/gitpython-developers/GitPython
+Source:         https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-%{version}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module gitdb2 >= 2.0.0}
+BuildRequires:  %{python_module ddt}
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module smmap2 >= 2.0.0}
+BuildRequires:  git
+BuildRequires:  python-mock
 %endif
+Requires:       git
+Requires:       python-gitdb2 >= 2.0.0
+BuildArch:      noarch
+
+%python_subpackages
 
 %description
 GitPython is a python library used to interact with Git repositories.
@@ -53,14 +60,19 @@ are 'cgit' and pure python, which is the default.
 %setup -q -n GitPython-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE
+%if %{with test}
+%check
+%python_exec setup.py test
+%endif
+
+%files %{python_files}
+%doc AUTHORS CHANGES LICENSE README.md
 %{python_sitelib}/*
 
 %changelog