Notification time stamped 2019-11-30 18:55:31 UTC
From aa2dd42b76d25d074d43c6b12d1ce73184ccb6d1 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Apr 23 2019 01:49:23 +0000
Subject: Merge commit '2155615a6c2749a836dd5fcc5a5d4cd27899560b' into epel7
Conflicts:
python-rfc3986.spec
---
diff --git a/.gitignore b/.gitignore
index ff0332c..a028064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/rfc3986-0.2.0.tar.gz
+/rfc3986-0.3.1.tar.gz
+/rfc3986-1.2.0.tar.gz
diff --git a/python-rfc3986.spec b/python-rfc3986.spec
index 84138e0..fef7c95 100644
--- a/python-rfc3986.spec
+++ b/python-rfc3986.spec
@@ -1,13 +1,12 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+# Created by pyp2rpm-1.1.0b
+%if 0%{?fedora}
+%global with_python3 1
%endif
%global pypi_name rfc3986
Name: python-%{pypi_name}
-Version: 0.2.0
+Version: 1.2.0
Release: 1%{?dist}
Summary: Validating URI References per RFC 3986
@@ -16,7 +15,27 @@ URL:
https://pypi.python.org/pypi/rfc3986
Source0:
https://pypi.python.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{ver...
BuildArch: noarch
+%package -n python2-%{pypi_name}
+Summary: Validating URI References per RFC 3986
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
BuildRequires: python2-devel
+BuildRequires: python2-setuptools
+
+%description -n python2-%{pypi_name}
+A Python implementation of RFC 3986 including validation and authority parsing.
+
+%if 0%{?with_python3}
+%package -n python3-%{pypi_name}
+Summary: Validating URI References per RFC 3986
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+
+%description -n python3-%{pypi_name}
+A Python implementation of RFC 3986 including validation and authority parsing.
+%endif
%description
@@ -28,20 +47,71 @@ A Python implementation of RFC 3986 including validation and authority
parsing.
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
-
%build
-%{__python2} setup.py build
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
%install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
+%if 0%{?with_python3}
+%py3_install
+%endif
-%files
+%files -n python2-%{pypi_name}
%doc README.rst LICENSE
%{python2_sitelib}/%{pypi_name}
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%if 0%{?with_python3}
+%files -n python3-%{pypi_name}
+%doc README.rst LICENSE
+%{python3_sitelib}/%{pypi_name}
+%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+
+%endif
+
%changelog
+* Wed Jan 02 2019 Yatin Karel <ykarel(a)redhat.com> - 1.2.0-1
+- Bump to 1.2.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-9
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 0.3.1-8
+- Rebuilt for Python 3.7
+
+* Fri Feb 09 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.3.1-7
+- Update Python 2 dependency declarations to new packaging standards
+ (See
https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Dec 19 2016 Miro Hrončok <mhroncok(a)redhat.com> - 0.3.1-3
+- Rebuild for Python 3.6
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.3.1-2
+-
https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
+
+* Mon Jun 20 2016 Javier Peña <jpena(a)redhat.com> - 0.3.1-4
+- Updated to upstream version 0.3.1
+- Added python3 subpackage
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0.2.0-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Mon Sep 15 2014 Alan Pevec <apevec(a)redhat.com> - 0.2.0-1
- Initial package.
diff --git a/sources b/sources
index 550a24e..b05c5cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a80b964a92c3a40e57ec95f7c0d68fa9 rfc3986-0.2.0.tar.gz
+SHA512 (rfc3986-1.2.0.tar.gz) =
b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
https://src.fedoraproject.org/rpms/python-rfc3986/c/aa2dd42b76d25d074d43c...