[python-bugzilla/el6] Rebased to version 1.0.0 Python 3 support (Arun Babu Neelicattu) Port to python-requests (Arun Babu

[Cole Robinson]

commit d890e159c618b69cd1475ac97e56d885c5279633
Author: Cole Robinson <crobinso at redhat.com>
Date:   Tue Mar 25 18:40:00 2014 -0400

    Rebased to version 1.0.0
    Python 3 support (Arun Babu Neelicattu)
    Port to python-requests (Arun Babu Neelicattu)
    bugzilla: new: Add --keywords, --assigned_to, --qa_contact (Lon
    Hohberger)
    bugzilla: query: Add --quicksearch, --savedsearch
    bugzilla: query: Support saved searches with --from-url
    bugzilla: --sub-component support for all relevant commands

 .gitignore           |    1 +
 python-bugzilla.spec |   96 ++++++++++++++++++++++++++++++++++++++------------
 sources              |    2 +-
 3 files changed, 75 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 212aa5e..46f6ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ python-bugzilla-0.6.0.tar.bz2
 /python-bugzilla-0.7.0.tar.gz
 /python-bugzilla-0.8.0.tar.gz
 /python-bugzilla-0.9.0.tar.gz
+/python-bugzilla-1.0.0.tar.gz
diff --git a/python-bugzilla.spec b/python-bugzilla.spec
index 07eb08e..a122785 100644
--- a/python-bugzilla.spec
+++ b/python-bugzilla.spec
@@ -1,63 +1,113 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} ||0%{?rhel} >= 7
+%global with_python3 1
+%else
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib2: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
+%endif
 
 Name:           python-bugzilla
-Version:        0.9.0
+Version:        1.0.0
 Release:        1%{?dist}
-Summary:        A python library for interacting with Bugzilla
+Summary:        A python library and tool for interacting with Bugzilla
 
-Group:          Development/Languages
 License:        GPLv2+
 URL:            https://fedorahosted.org/python-bugzilla
 Source0:        https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
-%if 0%{?rhel} == 5
-BuildRequires:  python-setuptools
-%else
-BuildRequires:  python-setuptools-devel
-%endif
+BuildRequires: python2-devel
+BuildRequires: python-requests
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-requests
+%endif # if with_python3
 
-BuildRequires: python-pycurl
-Requires: python-pycurl
+Requires: python-requests
 Requires: python-magic
 
+%if 0%{?with_python3}
+Requires: python3-requests
+Requires: python3-magic
+%endif # if with_python3
+
+
 %description
-python-bugzilla is a python library for interacting with bugzilla instances
+python-bugzilla is a python 2 library for interacting with bugzilla instances
 over XML-RPC. This package also includes the 'bugzilla' command-line tool
 for interacting with bugzilla from shell scripts.
 
+
+%if 0%{?with_python3}
+%package -n python3-bugzilla
+Summary: A python 3 library for interacting with Bugzilla
+
+%description -n python3-bugzilla
+python3-bugzilla is a python 3 library for interacting with bugzilla instances
+over XML-RPC.
+%endif # if with_python3
+
+
 %prep
 %setup -q
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3
+
 
 %build
-%{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+%{__python2} setup.py build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+# Must do the python3 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 -O1 --skip-build --root %{buildroot}
+popd
+%endif # with_python3
 
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
-%check
-python setup.py test
 
+%check
+%{__python2} setup.py test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README PKG-INFO
-%{python_sitelib}/*
+%{python2_sitelib}/*
 %{_bindir}/bugzilla
 %{_mandir}/man1/bugzilla.1.gz
 
-
+%if 0%{?with_python3}
+%files -n python3-bugzilla
+%doc COPYING README PKG-INFO
+%{python3_sitelib}/*
+%endif # with_python3
 %changelog
+* Tue Mar 25 2014 Cole Robinson <crobinso at redhat.com> - 1.0.0-1
+- Rebased to version 1.0.0
+- Python 3 support (Arun Babu Neelicattu)
+- Port to python-requests (Arun Babu Neelicattu)
+- bugzilla: new: Add --keywords, --assigned_to, --qa_contact (Lon
+  Hohberger)
+- bugzilla: query: Add --quicksearch, --savedsearch
+- bugzilla: query: Support saved searches with --from-url
+- bugzilla: --sub-component support for all relevant commands
+
 * Wed Jun 19 2013 Cole Robinson <crobinso at redhat.com> - 0.9.0-1
 - Rebased to version 0.9.0
 - bugzilla: modify: add --dependson (Don Zickus)
diff --git a/sources b/sources
index baabf30..f75d65c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40365dd71823d7b14d695054a61ef264  python-bugzilla-0.9.0.tar.gz
+f2d64d906f503ca3c93bbc533f1168cf  python-bugzilla-1.0.0.tar.gz