diff --git a/python-bqplot.spec b/python-bqplot.spec
index 1911813..81be957 100644
--- a/python-bqplot.spec
+++ b/python-bqplot.spec
@@ -23,11 +23,20 @@ Release:        0
 Summary:        Interactive plotting package for the Jupyter notebook
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            https://github.com/bloomberg/bqplot
-Source:         https://files.pythonhosted.org/packages/py2.py3/b/bqplot/bqplot-%{version}-py2.py3-none-any.whl
+URL:            https://github.com/bloomberg/bqplot
+Source:         https://files.pythonhosted.org/packages/source/b/bqplot-%{version}-py2.py3-none/bqplot-%{version}-py2.py3-none-any.whl
 BuildRequires:  %{python_module pip}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       jupyter-bqplot = %{version}
+Requires:       python-ipywidgets >= 7.0.0a8
+Requires:       python-numpy >= 1.10.4
+Requires:       python-pandas
+Requires:       python-traitlets >= 4.3.0
+Requires:       python-traittypes >= 0.0.6
+Provides:       python-jupyter_bqplot = %{version}
+Obsoletes:      python-jupyter_bqplot < %{version}
+BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module ipywidgets >= 7.0.0a8}
 BuildRequires:  %{python_module numpy >= 1.10.4}
@@ -35,16 +44,6 @@ BuildRequires:  %{python_module pandas}
 BuildRequires:  %{python_module traitlets >= 4.3.0}
 BuildRequires:  %{python_module traittypes >= 0.0.6}
 # /SECTION
-Requires:       python-ipywidgets >= 7.0.0a8
-Requires:       python-numpy >= 1.10.4
-Requires:       python-pandas
-Requires:       python-traitlets >= 4.3.0
-Requires:       python-traittypes >= 0.0.6
-Requires:       jupyter-bqplot = %{version}
-Provides:       python-jupyter_bqplot = %{version}
-Obsoletes:      python-jupyter_bqplot < %{version}
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -55,8 +54,8 @@ This package provides the python interface.
 
 %package     -n jupyter-bqplot
 Summary:        Interactive plotting package for the Jupyter notebook
-Requires:       python3-bqplot = %{version}
 Requires:       jupyter-notebook
+Requires:       python3-bqplot = %{version}
 
 %description -n jupyter-bqplot
 Plotting system for the Jupyter notebook based on the
@@ -65,7 +64,7 @@ interactive Jupyter widgets.
 This package provides the jupyter notebook extension.
 
 %prep
-%setup -c -T
+%setup -q -c -T
 
 %build
 # Not Needed
@@ -73,14 +72,14 @@ This package provides the jupyter notebook extension.
 %install
 %python_expand pip%{$python_bin_suffix} install --root=%{buildroot} %{SOURCE0}
 
-%{python_expand sed -i -e "s|^#!/usr/bin/env python|#!%{__$python}|" %{buildroot}%{$python_sitelib}/bqplot/install.py
+%{python_expand sed -i -e "s|^#!%{_bindir}/env python|#!%{__$python}|" %{buildroot}%{$python_sitelib}/bqplot/install.py
 chmod a+x %{buildroot}%{$python_sitelib}/bqplot/install.py
 $python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/bqplot/
 $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/bqplot/
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 }
 
-%jupyter_move_config
+%{jupyter_move_config}
 cp %{buildroot}%{python3_sitelib}/bqplot-%{version}.dist-info/LICENSE .
 %{fdupes %{buildroot}%{_jupyter_prefix} %{buildroot}%{python3_sitelib}}