Update to 0.5.0

python-pdfkit.spec

@@ -1,32 +1,23 @@
-%if 0%{?fedora} > 12
-%global with_python3 1
-%else
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%endif
-
 %global pypi_name pdfkit
 
 Name:           python-%{pypi_name}
-Version:        0.4.1
-Release:        8%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Wkhtmltopdf python wrapper
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/JazzCore/python-pdfkit
-Source0:        https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.zip
 
 BuildArch:      noarch 
 BuildRequires:  python-setuptools
 BuildRequires:  python2-devel
-%if 0%{?with_python3}
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-devel
 BuildRequires:  python3
 Requires:       python3
 Requires:       wkhtmltopdf
-%endif # if with_python3
 
 Requires:       wkhtmltopdf
 
@@ -35,62 +26,58 @@ Python 2 wrapper for wkhtmltopdf utility to convert HTML to PDF using Webkit.
 
 This is an adapted version of Ruby PDFKit.
 
-%if 0%{?with_python3}
+%package -n python2-%{pypi_name}
+Summary:        Wkhtmltopdf python wrapper
+Group:          Development/Libraries
+%{?python_provide:%python_provide python2-%{pypi_name}}
+%description -n python2-%{pypi_name}
+Python 2 wrapper for wkhtmltopdf utility to convert HTML to PDF using Webkit.
+
+This is an adapted version of Ruby PDFKit.
+
 %package -n python3-%{pypi_name}
 Summary:        Wkhtmltopdf python wrapper
 Group:          Development/Libraries
-
+%{?python_provide:%python_provide python3-%{pypi_name}}
 %description -n python3-%{pypi_name}
 Python 3 wrapper for wkhtmltopdf utility to convert HTML to PDF using Webkit.
 
 This is an adapted version of Ruby PDFKit.
-%endif # if with_python3
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
-
 %build
-%{__python2} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
+%py2_build
+%py3_build
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
+%py3_install
 
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root=%{buildroot}
-popd
-%endif # with_python3
-
-%files
+%files -n python2-%{pypi_name}
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.rst LICENSE HISTORY.rst
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.rst HISTORY.rst
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
 
 %changelog
+* Thu Sep 17 2015 William Moreno Reyes <williamjmorenor at gmail.com> 
+- 0.5.0-1
+- Update to 0.5.0
+- Update python macros
+- Include python 2 and 3 subpackage
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild