[pyp2rpm] Update to 1.1.0b

[Robert Kuska]

commit dbf51aecd3e9ce515379b0bf3ca40feb2a486f8f
Author: Robert Kuska <rkuska at redhat.com>
Date:   Wed Apr 30 08:53:50 2014 +0200

    Update to 1.1.0b

 .gitignore   |    2 +
 pyp2rpm.spec |   81 ++++++---------------------------------------------------
 sources      |    4 +-
 3 files changed, 13 insertions(+), 74 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 124f406..be174cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /pyp2rpm-0.5.1.tar.gz
 /pyp2rpm-1.0.1.tar.gz
 /pyp2rpm-1.0.1-tests.tgz
+/pyp2rpm-1.1.0b.tar.gz
+/pyp2rpm-1.1.0b-tests.tgz
diff --git a/pyp2rpm.spec b/pyp2rpm.spec
index 42e3d82..8cee94e 100644
--- a/pyp2rpm.spec
+++ b/pyp2rpm.spec
@@ -1,10 +1,9 @@
 # Created by pyp2rpm-0.5.1
 %global pypi_name pyp2rpm
-%global with_python3 1
 
 Name:           %{pypi_name}
-Version:        1.0.1
-Release:        4%{?dist}
+Version:        1.1.0b
+Release:        1%{?dist}
 Summary:        Convert Python packages to RPM SPECFILES
 
 License:        MIT
@@ -16,41 +15,19 @@ Source0:        http://pypi.python.org/packages/source/p/%{pypi_name}/%{pypi_nam
 Source1:        %{name}-%{version}-tests.tgz
 BuildArch:      noarch
  
-BuildRequires:  python-devel
-BuildRequires:  pytest
-BuildRequires:  python-flexmock >= 0.9.3
-BuildRequires:  python-jinja2
-BuildRequires:  python-setuptools
- 
-%if %{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-pytest
 BuildRequires:  python3-flexmock >= 0.9.3
-BuildRequires:  python3-jinja2
 BuildRequires:  python3-setuptools
-%endif # if with_python3
+BuildRequires:  python3-jinja2
  
-Requires:       python-jinja2
-Requires:       python-setuptools
-Requires:       rpmdevtools
-
-%description
-Convert Python packages to RPM SPECFILES. The packages can be downloaded from
-PyPI and the produced SPEC is in line with Fedora Packaging Guidelines.
-
-Users can provide their own templates for rendering the package metadata. Both
-the package source and metadata can be extracted from PyPI or from local
-filesystem (local file doesn't provide that much information though).
-
-%if 0%{?with_python3}
-%package -n     python3-%{pypi_name}
 Summary:        Convert Python packages to RPM SPECFILES
 
 Requires:       python3-jinja2
 Requires:       python3-setuptools
 Requires:       rpmdevtools
 
-%description -n python3-%{pypi_name}
+%description
 Convert Python packages to RPM SPECFILES. The packages can be downloaded from
 PyPI and the produced SPEC is in line with Fedora Packaging Guidelines.
 
@@ -60,7 +37,6 @@ package
 source and metadata can be extracted from PyPI or from local filesystem
 (local file doesn't
 provide that much information though).
-%endif # with_python3
 
 
 %prep
@@ -68,70 +44,31 @@ provide that much information though).
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
-sed -i 's/distribute/setuptools/' setup.py
-
-
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-
-sed -i 's/distribute/setuptools/' setup.py
-
-%endif # with_python3
-
+find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
 
 %build
-%{__python} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
 %{__python3} setup.py build
-popd
-%endif # with_python3
 
 
 %install
-# Must do the subpackages' install first because the scripts in /usr/bin are
-# overwritten with every setup.py install (and we want the python2 version
-# to be the default for now).
-%if 0%{?with_python3}
-pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
-mv %{buildroot}%{_bindir}/pyp2rpm %{buildroot}/%{_bindir}/python3-pyp2rpm
-popd
-%endif # with_python3
-
-%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %check
 tar xzf %{SOURCE1}
-PYTHONPATH=$(pwd) py.test
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-tar xzf %{SOURCE1}
-PYTHONPATH=$(pwd) py.test-%{python3_version}
-popd
-%endif
-
+%{__python3} setup.py test
 
 %files
 %doc README.rst LICENSE
 %{_bindir}/pyp2rpm
-%{python_sitelib}/%{pypi_name}
-%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%if 0%{?with_python3}
-%files -n python3-%{pypi_name}
-%doc README.rst LICENSE
-%{_bindir}/python3-pyp2rpm
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
 
 
 %changelog
+* Tue Apr 29 2014 Robert Kuska <rkuska at redhat.com> - 1.1.0b-1
+- Update to v1.1.0b
+
 * Wed Jan 29 2014 Robert Kuska <rkuska at redhat.com> - 1.0.1-4
 - Change requires from distribute to setuptools
 - Add rpmdevtools to requires
diff --git a/sources b/sources
index 6de8559..681e596 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1e9a514d8dab9782f699ded2eb268237  pyp2rpm-1.0.1.tar.gz
-d6ffe3cd0acb10af01c99a77e6bd51f3  pyp2rpm-1.0.1-tests.tgz
+4b8ece8fb79d9dea5669f4db7da26ad3  pyp2rpm-1.1.0b.tar.gz
+dd0acaa2e6ba1d4d7191e5688ec4d428  pyp2rpm-1.1.0b-tests.tgz