Make click own its folder, use devel macros

python-click.spec

@@ -2,13 +2,9 @@
 %global pypi_name click
 %global with_python3 1
 
-%global py2v %(%{__python2} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))")
-%global py3v %(%{__python3} -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))")
-
-
 Name:           python-%{pypi_name}
 Version:        1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple wrapper around optparse for powerful command line utilities
 
 License:        BSD
@@ -82,27 +78,31 @@ popd
 
 %check
 tar xzf %{SOURCE1}
-PYTHONPATH=`pwd` py.test-%{py2v} tests --tb=long --verbose 
+PYTHONPATH=$(pwd) py.test-%{python2_version} tests --tb=long --verbose 
 %if 0%{?with_python3}
 pushd %{py3dir}
 tar xzf %{SOURCE1}
-LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=`pwd` py.test-%{py3v} tests --tb=long --verbose 
+LANG=en_GB.utf8 LC_ALL=en_GB.utf8 PYTHONPATH=$(pwd) py.test-%{python3_version} tests --tb=long --verbose 
 popd
 %endif
 
 %files
 %doc README 
-%{python2_sitelib}/%{pypi_name}/*
+%{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %doc README
-%{python3_sitelib}/%{pypi_name}/*
+%{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %endif # with_python3
 
 
 %changelog
+* Fri Jun 06 2014 Robert Kuska <rkuska@redhat.com> - 1.1-3
+- Make click own its folder
+- Use pythonX_version macros from devel package
+
 * Thu May 29 2014 Robert Kuska <rkuska@redhat.com> - 1.1-2
 - Remove __pycache__ folder from tests