SERVER-64352 mongo shell no longer built by default

(cherry picked from commit f59190ee55876c17de0ba92aaae9d2b369cdf901)

8 files changed, 16 insertions, 256 deletions

diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec
index a1b908f72c5..bea8d034031 100644
--- a/rpm/mongodb-enterprise-init.spec
+++ b/rpm/mongodb-enterprise-init.spec
@@ -25,7 +25,7 @@ Summary: MongoDB open source document-oriented database system (enterprise metap
 License: Commercial
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-enterprise-cryptd, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-database-tools-extra, mongodb-enteprise-shell
+Requires: mongodb-enterprise-cryptd, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -116,32 +116,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and init.d scripts.
 
-%package -n mongodb-enterprise-shell
-Summary: MongoDB shell client (enterprise)
-Group: Applications/Databases
-Requires: openssl %{?el6:>= 1.0.1}, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi
-Conflicts: mongo-10gen, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools
-Obsoletes: mongo-10gen-enterprise-shell
-Provides: mongo-10gen-enterprise-shell
-
-%description -n mongodb-enterprise-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-enterprise-mongos
 Summary: MongoDB sharded cluster query router (enterprise)
 Group: Applications/Databases
@@ -282,7 +256,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -354,11 +328,6 @@ fi
 
 
 
-%files -n mongodb-enterprise-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-enterprise-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec
index 883f998c2e8..17061790416 100644
--- a/rpm/mongodb-enterprise-unstable-init.spec
+++ b/rpm/mongodb-enterprise-unstable-init.spec
@@ -24,7 +24,7 @@ Summary: MongoDB open source document-oriented database system (enterprise metap
 License: Commercial
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-enterprise-unstable-cryptd, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-database-tools-extra, mongodb-enterprise-unstable-shell
+Requires: mongodb-enterprise-unstable-cryptd, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -113,30 +113,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and init.d scripts.
 
-%package -n mongodb-enterprise-unstable-shell
-Summary: MongoDB shell client (enterprise)
-Group: Applications/Databases
-Requires: openssl %{?el6:>= 1.0.1}, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi
-Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools
-
-%description -n mongodb-enterprise-unstable-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-enterprise-unstable-mongos
 Summary: MongoDB sharded cluster query router (enterprise)
 Group: Applications/Databases
@@ -271,7 +247,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -343,11 +319,6 @@ fi
 %doc THIRD-PARTY-NOTICES
 %doc MPL-2
 
-%files -n mongodb-enterprise-unstable-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-enterprise-unstable-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec
index 58803bcad15..2fc31f962ec 100644
--- a/rpm/mongodb-enterprise-unstable.spec
+++ b/rpm/mongodb-enterprise-unstable.spec
@@ -24,7 +24,7 @@ Summary: MongoDB open source document-oriented database system (enterprise metap
 License: Commercial
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-enterprise-unstable-cryptd, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-database-tools-extra, mongodb-enterprise-unstable-shell
+Requires: mongodb-enterprise-unstable-cryptd, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -120,30 +120,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and systemd service files.
 
-%package -n mongodb-enterprise-unstable-shell
-Summary: MongoDB shell client (enterprise)
-Group: Applications/Databases
-Requires: openssl, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi
-Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools
-
-%description -n mongodb-enterprise-unstable-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-enterprise-unstable-mongos
 Summary: MongoDB sharded cluster query router (enterprise)
 Group: Applications/Databases
@@ -278,7 +254,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -351,11 +327,6 @@ fi
 %doc THIRD-PARTY-NOTICES
 %doc MPL-2
 
-%files -n mongodb-enterprise-unstable-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-enterprise-unstable-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec
index e48fecf07b4..09fdc5a48c4 100644
--- a/rpm/mongodb-enterprise.spec
+++ b/rpm/mongodb-enterprise.spec
@@ -25,7 +25,7 @@ Summary: MongoDB open source document-oriented database system (enterprise metap
 License: Commercial
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-enterprise-cryptd, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-database-tools-extra, mongodb-enterprise-shell
+Requires: mongodb-enterprise-cryptd, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -123,32 +123,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and systemd service files.
 
-%package -n mongodb-enterprise-shell
-Summary: MongoDB shell client (enterprise)
-Group: Applications/Databases
-Requires: openssl, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi
-Conflicts: mongo-10gen, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools
-Obsoletes: mongo-10gen-enterprise-shell
-Provides: mongo-10gen-enterprise-shell
-
-%description -n mongodb-enterprise-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-enterprise-mongos
 Summary: MongoDB sharded cluster query router (enterprise)
 Group: Applications/Databases
@@ -289,7 +263,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s,ldap,kerberos}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -360,11 +334,6 @@ fi
 
 
 
-%files -n mongodb-enterprise-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-enterprise-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec
index 0500d557393..6cd8a04f763 100644
--- a/rpm/mongodb-org-init.spec
+++ b/rpm/mongodb-org-init.spec
@@ -25,7 +25,7 @@ Summary: MongoDB open source document-oriented database system (metapackage)
 License: SSPL
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-org-mongos, mongodb-org-server, mongodb-org-database-tools-extra, mongodb-org-shell
+Requires: mongodb-org-mongos, mongodb-org-server, mongodb-org-database-tools-extra
 
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
@@ -117,32 +117,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and init.d scripts.
 
-%package -n mongodb-org-shell
-Summary: MongoDB shell client
-Group: Applications/Databases
-Requires: openssl %{?el6:>= 1.0.1}
-Conflicts: mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools
-Obsoletes: mongo-10gen-shell
-Provides: mongo-10gen-shell
-
-%description -n mongodb-org-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-org-mongos
 Summary: MongoDB sharded cluster query router
 Group: Applications/Databases
@@ -259,7 +233,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -326,11 +300,6 @@ fi
 
 
 
-%files -n mongodb-org-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-org-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec
index abd4fb275e8..3e9a4269c98 100644
--- a/rpm/mongodb-org-unstable-init.spec
+++ b/rpm/mongodb-org-unstable-init.spec
@@ -23,7 +23,7 @@ Summary: MongoDB open source document-oriented database system (metapackage)
 License: SSPL
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-org-unstable-mongos, mongodb-org-unstable-mongod, mongodb-org-unstable-database-tools-extra, mongodb-org-unstable-shell
+Requires: mongodb-org-unstable-mongos, mongodb-org-unstable-mongod, mongodb-org-unstable-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -112,30 +112,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and init.d scripts.
 
-%package -n mongodb-org-unstable-shell
-Summary: MongoDB shell client
-Group: Applications/Databases
-Requires: openssl %{?el6:>= 1.0.1}
-Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools
-
-%description -n mongodb-org-unstable-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-org-unstable-mongos
 Summary: MongoDB sharded cluster query router
 Group: Applications/Databases
@@ -246,7 +222,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
@@ -313,11 +289,6 @@ fi
 %doc THIRD-PARTY-NOTICES
 %doc MPL-2
 
-%files -n mongodb-org-unstable-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-org-unstable-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec
index 256d0f2f75d..b35279037e1 100644
--- a/rpm/mongodb-org-unstable.spec
+++ b/rpm/mongodb-org-unstable.spec
@@ -23,7 +23,7 @@ Summary: MongoDB open source document-oriented database system (metapackage)
 License: SSPL
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-database-tools-extra, mongodb-org-unstable-shell
+Requires: mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -119,30 +119,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and systemd service files.
 
-%package -n mongodb-org-unstable-shell
-Summary: MongoDB shell client
-Group: Applications/Databases
-Requires: openssl
-Conflicts: mongo-10gen, mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org, mongodb-org-mongos, mongodb-org-server, mongodb-org-shell, mongodb-org-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools
-
-%description -n mongodb-org-unstable-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-org-unstable-mongos
 Summary: MongoDB sharded cluster query router
 Group: Applications/Databases
@@ -253,7 +229,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -318,11 +294,6 @@ fi
 %doc THIRD-PARTY-NOTICES
 %doc MPL-2
 
-%files -n mongodb-org-unstable-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-org-unstable-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec
index 21c1c41871c..7a19facf9d0 100644
--- a/rpm/mongodb-org.spec
+++ b/rpm/mongodb-org.spec
@@ -25,7 +25,7 @@ Summary: MongoDB open source document-oriented database system (metapackage)
 License: SSPL
 URL: http://www.mongodb.org
 Group: Applications/Databases
-Requires: mongodb-org-mongos, mongodb-org-server, mongodb-org-database-tools-extra, mongodb-org-shell
+Requires: mongodb-org-mongos, mongodb-org-server, mongodb-org-database-tools-extra
 
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
 BuildRequires: /usr/bin/pathfix.py, python3-devel
@@ -123,32 +123,6 @@ MongoDB features:
 
 This package contains the MongoDB server software, default configuration files, and systemd service files.
 
-%package -n mongodb-org-shell
-Summary: MongoDB shell client
-Group: Applications/Databases
-Requires: openssl
-Conflicts: mongo-10gen-enterprise, mongo-10gen-enterprise-server, mongo-10gen-unstable, mongo-10gen-unstable-enterprise, mongo-10gen-unstable-enterprise-mongos, mongo-10gen-unstable-enterprise-server, mongo-10gen-unstable-enterprise-shell, mongo-10gen-unstable-enterprise-tools, mongo-10gen-unstable-mongos, mongo-10gen-unstable-server, mongo-10gen-unstable-shell, mongo-10gen-unstable-tools, mongo18-10gen, mongo18-10gen-server, mongo20-10gen, mongo20-10gen-server, mongodb, mongodb-server, mongodb-dev, mongodb-clients, mongodb-10gen, mongodb-10gen-enterprise, mongodb-10gen-unstable, mongodb-10gen-unstable-enterprise, mongodb-10gen-unstable-enterprise-mongos, mongodb-10gen-unstable-enterprise-server, mongodb-10gen-unstable-enterprise-shell, mongodb-10gen-unstable-enterprise-tools, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-server, mongodb-10gen-unstable-shell, mongodb-10gen-unstable-tools, mongodb-enterprise, mongodb-enterprise-mongos, mongodb-enterprise-server, mongodb-enterprise-shell, mongodb-enterprise-tools, mongodb-nightly, mongodb-org-unstable, mongodb-org-unstable-mongos, mongodb-org-unstable-server, mongodb-org-unstable-shell, mongodb-org-unstable-tools, mongodb-stable, mongodb18-10gen, mongodb20-10gen, mongodb-enterprise-unstable, mongodb-enterprise-unstable-mongos, mongodb-enterprise-unstable-server, mongodb-enterprise-unstable-shell, mongodb-enterprise-unstable-tools
-Obsoletes: mongo-10gen-shell
-Provides: mongo-10gen-shell
-
-%description -n mongodb-org-shell
-MongoDB is built for scalability, performance and high availability, scaling from single server deployments to large, complex multi-site architectures. By leveraging in-memory computing, MongoDB provides high performance for both reads and writes. MongoDB’s native replication and automated failover enable enterprise-grade reliability and operational flexibility.
-
-MongoDB is an open-source database used by companies of all sizes, across all industries and for a wide variety of applications. It is an agile database that allows schemas to change quickly as applications evolve, while still providing the functionality developers expect from traditional databases, such as secondary indexes, a full query language and strict consistency.
-
-MongoDB has a rich client ecosystem including hadoop integration, officially supported drivers for 10 programming languages and environments, as well as 40 drivers supported by the user community.
-
-MongoDB features:
-* JSON Data Model with Dynamic Schemas
-* Auto-Sharding for Horizontal Scalability
-* Built-In Replication for High Availability
-* Rich Secondary Indexes, including geospatial
-* TTL indexes
-* Text Search
-* Aggregation Framework & Native MapReduce
-
-This package contains the mongo shell.
-
 %package -n mongodb-org-mongos
 Summary: MongoDB sharded cluster query router
 Group: Applications/Databases
@@ -265,7 +239,7 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
 cp -rv bin $RPM_BUILD_ROOT%{_prefix}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/mongo{,d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+cp debian/mongo{d,s}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 cp debian/mongodb-parameters.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -332,11 +306,6 @@ fi
 
 
 
-%files -n mongodb-org-shell
-%defattr(-,root,root,-)
-%{_bindir}/mongo
-%{_mandir}/man1/mongo.1*
-
 %files -n mongodb-org-mongos
 %defattr(-,root,root,-)
 %{_bindir}/mongos