Upstream release 2.18, Python 3 support

python-xmltramp.spec

@@ -1,8 +1,7 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-xmltramp
-Version:        2.17
-Release:        21%{?dist}
+Version:        2.18
+Release:        1%{?dist}
 Summary:        Pythonic API for XML
 
 Group:          Development/Languages
@@ -12,10 +11,15 @@ License:        GPLv2
 
 URL:            http://www.aaronsw.com/2002/xmltramp/
 Source0:        http://www.aaronsw.com/2002/xmltramp/xmltramp-%{version}.py
-Patch0:         %{name}-%{version}-nsprefixes.patch
+Patch1:         0001-Patch-for-RHBZ-750694.patch
+Patch2:         0002-fix-imports-and-syntax-for-Python-3.patch
+Patch3:         0003-__str__-needs-to-return-str-not-bytes-on-Python-3.patch
+Patch4:         0004-empty-slice-is-slice-None-None-None-on-Python-3.patch
+Patch5:         0005-use-OrderedDict-for-attributes-and-namespaces.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
+BuildRequires:  python3-devel
 
 %global _description\
 xmltramp is a simple Pythonic API for working with XML
@@ -28,30 +32,48 @@ Summary: %summary
 
 %description -n python2-xmltramp %_description
 
+%package -n python3-xmltramp
+Summary: %summary
+%{?python_provide:%python_provide python3-xmltramp}
+
+%description -n python3-xmltramp %_description
+
 %prep
 %setup -c -T
 cp -p %{SOURCE0} xmltramp.py
-%patch0 -p1 -b.nsprefixes
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # noarch
 
 %check
-%{__python} xmltramp.py
+%{__python2} xmltramp.py
+%{__python3} xmltramp.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{python_sitelib}/
-cp -p xmltramp.py $RPM_BUILD_ROOT/%{python_sitelib}/
-
- 
+mkdir -p $RPM_BUILD_ROOT/%{python2_sitelib}/
+cp -p xmltramp.py $RPM_BUILD_ROOT/%{python2_sitelib}/
+mkdir -p $RPM_BUILD_ROOT/%{python3_sitelib}/
+cp -p xmltramp.py $RPM_BUILD_ROOT/%{python3_sitelib}/
 
 %files -n python2-xmltramp
-%defattr(-,root,root,-)
-%{python_sitelib}/xmltramp.py*
+%{python2_sitelib}/xmltramp.py*
+
+%files -n python3-xmltramp
+%{python3_sitelib}/xmltramp.py*
+%{python3_sitelib}/__pycache__/
 
 
 %changelog
+* Thu Jul 05 2018 Dan Callaghan <dcallagh@redhat.com> - 2.18-1
+- Updated to upstream release 2.18 (only ~10 years late...)
+- Minimal fixes to support Python 3
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.17-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild