diff --git a/pygraphviz-1.3.1.tar.gz b/pygraphviz-1.3.1.tar.gz
deleted file mode 100644
index b2a9095..0000000
--- a/pygraphviz-1.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408
-size 103336
diff --git a/pygraphviz-1.4rc1.tar.gz b/pygraphviz-1.4rc1.tar.gz
new file mode 100644
index 0000000..00858c3
--- /dev/null
+++ b/pygraphviz-1.4rc1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a0567a2e63dd83a8dc3d37889b5a90eff9ed641fc07681dcf56b6964d329301
+size 105374
diff --git a/python-pygraphviz.changes b/python-pygraphviz.changes
index 5cf8c5b..75584ef 100644
--- a/python-pygraphviz.changes
+++ b/python-pygraphviz.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 17 21:43:00 UTC 2017 - toddrme2178@gmail.com
+
+- Implement single-spec version
+- Fix source URL
+- Update to version 1.4rc1
+  * No upstream changelog
+
 -------------------------------------------------------------------
 Wed Jun 15 17:11:49 UTC 2016 - toddrme2178@gmail.com
 
diff --git a/python-pygraphviz.spec b/python-pygraphviz.spec
index 66bc6ee..90a4511 100644
--- a/python-pygraphviz.spec
+++ b/python-pygraphviz.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pygraphviz
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products 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,52 +16,75 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pygraphviz
-Version:        1.3.1
+Version:        1.4rc1
 Release:        0
 Url:            http://networkx.lanl.gov/pygraphviz
 Summary:        Python interface to Graphviz
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         https://pypi.python.org/packages/source/p/pygraphviz/pygraphviz-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/p/pygraphviz/pygraphviz-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM docdir.patch
 Patch:          docdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  graphviz-devel >= 2.16
 BuildRequires:  pkg-config
-BuildRequires:  python-nose
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  swig
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+# Needed even without tests
+BuildRequires:  %{python_module nose}
 Requires:       graphviz >= 2.16
-%if 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
+%python_subpackages
 
 %description
 A Python wrapper for the Graphviz Agraph data structure.
 PyGraphviz can be used to create and draw networks and graphs with Graphviz.
 
+%package -n %{name}-doc
+Summary:        Documentation for %{name}
+Group:          Documentation/Other
+Provides:       %{python_module pygraphviz-doc = %{version}}
+
+%description -n %{name}-doc
+This package provides documentation and help files for %{name}
+
 %prep
 %setup -q -n pygraphviz-%{version}
 %patch
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+# Need command-line flags only available in install
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-chmod +x %{buildroot}%{python_sitearch}/pygraphviz/tests/test.py
+export CFLAGS="%{optflags}"
+%python_exec setup.py install -O1 --force --root %{buildroot} --prefix %{_prefix} --include-path %{_includedir}/graphviz/ --library-path %{_libdir}/graphviz/
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
+%python_expand chmod +x %{buildroot}%{$python_sitearch}/pygraphviz/tests/test.py
 
+%if %{with tests}
 %check
 pushd examples
-PYTHONPATH=%{buildroot}%{python_sitearch} python -c "import pygraphviz;pygraphviz.test()"
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
+$python -c "import pygraphviz;pygraphviz.test()"
+}
 popd
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc LICENSE README.rst
-%{_docdir}/pygraphviz-%{version}
 %{python_sitearch}/pygraphviz/
 %{python_sitearch}/pygraphviz-%{version}-py*.egg-info
 
+%files -n %{name}-doc
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_docdir}/pygraphviz-%{version}
+
 %changelog