.gitignore

@@ -1 +1 @@
-SOURCES/pymongo-3.7.0.tar.gz
+SOURCES/pymongo-3.6.1.tar.gz

.python-pymongo.metadata

@@ -1 +1 @@
-08de8bcf2cead4294c47e4987906990dc1913097 SOURCES/pymongo-3.7.0.tar.gz
+c45d2e4376976362a868823a9f8c01b3df75d7ee SOURCES/pymongo-3.6.1.tar.gz

SPECS/python-pymongo.spec

@@ -1,17 +1,14 @@
-%bcond_without python3
-%bcond_with python36_module
-
 # Only build on architectures supported by mongodb in RHEL8
-%global mongodb_arches x86_64 ppc64le aarch64 s390x
+%global mongodb_arches x86_64 ppc64le aarch64 s390x %{arm}
 
 # Fix private-shared-object-provides error
 %{?filter_setup:
-%filter_provides_in %{python2_sitearch}.*\.so$
+%filter_provides_in %{python_sitearch}.*\.so$
 %filter_setup
 }
 
 # Conditionalize tests
-%bcond_with tests
+%bcond_without tests
 
 %if 0%{?rhel} > 7
 # Disable python2 build by default
@@ -21,8 +18,8 @@
 %endif
 
 Name:           python-pymongo
-Version:        3.7.0
-Release:        1%{?dist}
+Version:        3.6.1
+Release:        5%{?dist}
 
 # All code is ASL 2.0 except bson/time64*.{c,h} which is MIT
 License:        ASL 2.0 and MIT
@@ -54,22 +51,15 @@ BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 %endif # with python2
 
-%if %{with python3}
-%if %{with python36_module}
-BuildRequires:  python36-devel
-BuildRequires:  python36-rpm-macros
-%else
 BuildRequires:  python3-devel
-%endif
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-sphinx
-%endif
+
 
 %description
 The Python driver for MongoDB.
 
 
-%if %{with python3}
 %package doc
 BuildArch: noarch
 Summary:   Documentation for python-pymongo
@@ -77,7 +67,6 @@ Summary:   Documentation for python-pymongo
 
 %description doc
 Documentation for python-pymongo.
-%endif
 
 %if %{with python2}
 %package -n python2-bson
@@ -92,7 +81,6 @@ embedding of objects and arrays within other objects and arrays.
 %endif # with python2
 
 
-%if %{with python3}
 %package -n python3-bson
 Summary:        Python bson library
 %{?python_provide:%python_provide python3-bson}
@@ -103,7 +91,6 @@ BSON is a binary-encoded serialization of JSON-like documents. BSON is designed
 to be lightweight, traversable, and efficient. BSON, like JSON, supports the
 embedding of objects and arrays within other objects and arrays.  This package
 contains the python3 version of this module.
-%endif
 
 
 %if %{with python2}
@@ -111,6 +98,7 @@ contains the python3 version of this module.
 Summary:        Python driver for MongoDB
 
 Requires:       python2-bson%{?_isa} = %{version}-%{release}
+Provides:       pymongo = %{version}-%{release}
 Obsoletes:      pymongo <= 2.1.1-4
 %{?python_provide:%python_provide python2-pymongo}
 
@@ -121,7 +109,6 @@ this module.
 %endif # with python2
 
 
-%if %{with python3}
 %package -n python3-pymongo
 Summary:        Python driver for MongoDB
 Requires:       python3-bson%{?_isa} = %{version}-%{release}
@@ -131,12 +118,12 @@ Requires:       python3-bson%{?_isa} = %{version}-%{release}
 %description -n python3-pymongo
 The Python driver for MongoDB.  This package contains the python3 version of
 this module.
-%endif
 
 %if %{with python2}
 %package -n python2-pymongo-gridfs
 Summary:        Python GridFS driver for MongoDB
 Requires:       python2-pymongo%{?_isa} = %{version}-%{release}
+Provides:       pymongo-gridfs = %{version}-%{release}
 Obsoletes:      pymongo-gridfs <= 2.1.1-4
 %{?python_provide:%python_provide python2-pymongo-gridfs}
 
@@ -146,7 +133,6 @@ GridFS is a storage specification for large objects in MongoDB.
 %endif # with python2
 
 
-%if %{with python3}
 %package -n python3-pymongo-gridfs
 Summary:        Python GridFS driver for MongoDB
 Requires:       python3-pymongo%{?_isa} = %{version}-%{release}
@@ -156,7 +142,6 @@ Requires:       python3-pymongo%{?_isa} = %{version}-%{release}
 %description -n python3-pymongo-gridfs
 GridFS is a storage specification for large objects in MongoDB.  This package
 contains the python3 version of this module.
-%endif
 
 
 %prep
@@ -173,13 +158,11 @@ rm pymongo/ssl_match_hostname.py
 %py2_build
 %endif # with python2
 
-%if %{with python3}
 %py3_build
 
 pushd doc
 SPHINXBUILD=sphinx-build-3 make %{?_smp_mflags} html
 popd
-%endif
 
 
 %install
@@ -190,12 +173,10 @@ chmod 755 %{buildroot}%{python2_sitearch}/bson/*.so
 chmod 755 %{buildroot}%{python2_sitearch}/pymongo/*.so
 %endif # with python2
 
-%if %{with python3}
 %py3_install
 # Fix permissions
 chmod 755 %{buildroot}%{python3_sitearch}/bson/*.so
 chmod 755 %{buildroot}%{python3_sitearch}/pymongo/*.so
-%endif
 
 
 %if %{with tests}
@@ -221,20 +202,16 @@ done
 %{__python2} setup.py test || (pkill mongod && exit 1)
 %endif # with python2
 
-%if %{with python3}
 %{__python3} setup.py test || (pkill mongod && exit 1)
-%endif
 
 pkill mongod
 %endif
 %endif # with tests
 
 
-%if %{with python3}
 %files doc
 %license LICENSE
 %doc doc/_build/html/*
-%endif
 
 %if %{with python2}
 %files -n python2-bson
@@ -244,12 +221,10 @@ pkill mongod
 %endif # with python2
 
 
-%if %{with python3}
 %files -n python3-bson
 %license LICENSE
 %doc README.rst
 %{python3_sitearch}/bson
-%endif
 
 %if %{with python2}
 %files -n python2-pymongo
@@ -260,13 +235,11 @@ pkill mongod
 %endif # with python2
 
 
-%if %{with python3}
 %files -n python3-pymongo
 %license LICENSE
 %doc README.rst
 %{python3_sitearch}/pymongo
 %{python3_sitearch}/pymongo-%{version}-*.egg-info
-%endif
 
 %if %{with python2}
 %files -n python2-pymongo-gridfs
@@ -276,41 +249,15 @@ pkill mongod
 %endif # with python2
 
 
-%if %{with python3}
 %files -n python3-pymongo-gridfs
 %license LICENSE
 %doc README.rst
 %{python3_sitearch}/gridfs
-%endif
 
 
 %changelog
-* Fri Oct 09 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.7.0-1
-- Rebase to 3.7.0
-- Includes new SCRAM-SHA-256 authentication
-  Resolves: rhbz#1879852
-
-* Fri Jun 07 2019 Tomas Orsava <torsava@redhat.com> - 3.6.1-11
-- Fix unversioned python macro that's causing a FTBFS
-- Related: rhbz#1678920
-
-* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 3.6.1-10
-- Bumping due to problems with modular RPM upgrade path
-- Resolves: rhbz#1695587
-
-* Thu Mar 28 2019 Charalampos Stratakis <cstratak@redhat.com> - 3.6.1-9
-- Disable the test suite as mongodb is not available anymore
-
-* Tue Oct 09 2018 Lumír Balhar <lbalhar@redhat.com> - 3.6.1-8
-- Remove unversioned provides
-- Resolves: rhbz#1628242
-
-* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 3.6.1-7
-- Make possible to disable python3 subpackage
-
-* Wed Jul 18 2018 Tomas Orsava <torsava@redhat.com> - 3.6.1-6
-- BuildRequire the python36-devel package when building for the python36 module
-- BuildRequire also python36-rpm-macros as part of the python36 module build
+* Tue Jun 18 2019 Johnny Hughes <johnny@centos.org> - 3.6.1-5
+- build on armhfp
 
 * Tue Jun 26 2018 Tomas Orsava <torsava@redhat.com> - 3.6.1-5
 - Fix checking of running mongod - test only open ports (not I-Node number)