diff options
author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2021-02-22 08:37:58 -0800 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-02-25 02:24:18 +0000 |
commit | 364c92daaa4666e6428b6e0b805d71a01edf395c (patch) | |
tree | df7f73ce5860b1981082b2f63df19591cf43fa72 /rpm/mongodb-org.spec | |
parent | b8107b8e481ae7073d30304196a3028145c80634 (diff) | |
download | mongo-364c92daaa4666e6428b6e0b805d71a01edf395c.tar.gz |
SERVER-54057 Move RPM python dependency to tools-extra package
This requirement should never have been on the server package once the
tools were moved to their own package. This change just moves the
requirement where it should be.
Diffstat (limited to 'rpm/mongodb-org.spec')
-rw-r--r-- | rpm/mongodb-org.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec index f5947448f1a..8e81e20463a 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -24,16 +24,17 @@ BuildRequires: /usr/bin/pathfix.py, python3-devel Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -%if 0%{?suse_version} -%define timezone_pkg timezone -%define python_pkg python -%else -%define timezone_pkg tzdata %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 %define python_pkg python3 %else %define python_pkg python2 %endif + +%if 0%{?suse_version} +%define timezone_pkg timezone +%define python_pkg python +%else +%define timezone_pkg tzdata %endif %description @@ -57,7 +58,7 @@ This metapackage will install the mongo shell, import/export tools, other client %package server Summary: MongoDB database server Group: Applications/Databases -Requires: openssl, %{timezone_pkg}, %{python_pkg} +Requires: openssl, %{timezone_pkg} 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-server Provides: mongo-10gen-server @@ -168,7 +169,7 @@ This metapackage exists to simplfy acquisition of both the database tools and th %package database-tools-extra Summary: MongoDB extra database tools Group: Applications/Databases -Requires: openssl +Requires: openssl, %{python_pkg} 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, mongodb-org-unstable-database-tools-extra, mongodb-enterprise-database-tools-extra, mongodb-enterprise-unstable-database-tools-extra, mongodb-org-tools <= 4.2 %description database-tools-extra |