Revert "SERVER-52610 Ensure RPM install roots can be relocated"

This reverts commit 51304bb545840ef0b62a6445b1060559ab831ea1.

9 files changed, 258 insertions, 469 deletions

diff --git a/buildscripts/packager.py b/buildscripts/packager.py
index e958fe7b4c4..37997bd4c85 100755
--- a/buildscripts/packager.py
+++ b/buildscripts/packager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 """Packager module.
 
 This program makes Debian and RPM repositories for MongoDB, by
@@ -29,8 +29,6 @@ echo "Now put the dist gnupg signing keys in ~root/.gnupg"
 
 """
 
-from __future__ import print_function
-
 import argparse
 import errno
 from glob import glob
@@ -251,11 +249,14 @@ class Distro(object):
                 self.dname, self.repo_os_version(build_os), repo_directory, self.repo_component(),
                 self.archname(arch))
         elif re.search("(redhat|fedora|centos|amazon)", self.dname):
-            return "repo/yum/%s/%s/mongodb-org/%s/%s/RPMS/" % (
-                self.dname, self.repo_os_version(build_os), repo_directory, self.archname(arch))
+            return "repo/yum/%s/%s/mongodb-org/%s/%s/RPMS/" % (self.dname,
+                                                               self.repo_os_version(build_os),
+                                                               repo_directory, self.archname(arch))
         elif re.search("(suse)", self.dname):
-            return "repo/zypper/%s/%s/mongodb-org/%s/%s/RPMS/" % (
-                self.dname, self.repo_os_version(build_os), repo_directory, self.archname(arch))
+            return "repo/zypper/%s/%s/mongodb-org/%s/%s/RPMS/" % (self.dname,
+                                                                  self.repo_os_version(build_os),
+                                                                  repo_directory,
+                                                                  self.archname(arch))
         else:
             raise Exception("BUG: unsupported platform?")
 
@@ -408,7 +409,7 @@ def main():
     prefix = args.prefix
     if prefix is None:
         prefix = tempfile.mkdtemp()
-    print("Working in directory %s" % prefix)
+    print "Working in directory %s" % prefix
 
     os.chdir(prefix)
     try:
@@ -448,7 +449,7 @@ def crossproduct(*seqs):
 
 def sysassert(argv):
     """Run argv and assert that it exited with status 0."""
-    print("In %s, running %s" % (os.getcwd(), " ".join(argv)))
+    print "In %s, running %s" % (os.getcwd(), " ".join(argv))
     sys.stdout.flush()
     sys.stderr.flush()
     assert subprocess.Popen(argv).wait() == 0
@@ -456,7 +457,7 @@ def sysassert(argv):
 
 def backtick(argv):
     """Run argv and return its output string."""
-    print("In %s, running %s" % (os.getcwd(), " ".join(argv)))
+    print "In %s, running %s" % (os.getcwd(), " ".join(argv))
     sys.stdout.flush()
     sys.stderr.flush()
     return subprocess.Popen(argv, stdout=subprocess.PIPE).communicate()[0]
@@ -492,11 +493,11 @@ def unpack_binaries_into(build_os, arch, spec, where):
         sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)])
         release_dir = glob('mongodb-linux-*')[0]
         for releasefile in "bin", "LICENSE-Community.txt", "README", "THIRD-PARTY-NOTICES", "THIRD-PARTY-NOTICES.gotools", "MPL-2":
-            print("moving file: %s/%s" % (release_dir, releasefile))
+            print "moving file: %s/%s" % (release_dir, releasefile)
             os.rename("%s/%s" % (release_dir, releasefile), releasefile)
         os.rmdir(release_dir)
     except Exception:
-        exc = sys.exc_info()[1]
+        exc = sys.exc_value
         os.chdir(rootdir)
         raise exc
     os.chdir(rootdir)
@@ -514,7 +515,7 @@ def make_package(distro, build_os, arch, spec, srcdir):
     # directory, so the debian directory is needed in all cases (and
     # innocuous in the debianoids' sdirs).
     for pkgdir in ["debian", "rpm"]:
-        print("Copying packaging files from %s to %s" % ("%s/%s" % (srcdir, pkgdir), sdir))
+        print "Copying packaging files from %s to %s" % ("%s/%s" % (srcdir, pkgdir), sdir)
         # FIXME: sh-dash-cee is bad. See if tarfile can do this.
         sysassert([
             "sh", "-c",
@@ -608,13 +609,11 @@ def make_deb_repo(repo, distro, build_os):
     oldpwd = os.getcwd()
     os.chdir(repo + "../../../../../../")
     try:
-        dirs = {
-            os.path.dirname(deb)[2:]
-            for deb in backtick(["find", ".", "-name", "*.deb"]).decode('utf-8').split()
-        }
+        dirs = set(
+            [os.path.dirname(deb)[2:] for deb in backtick(["find", ".", "-name", "*.deb"]).split()])
         for directory in dirs:
             st = backtick(["dpkg-scanpackages", directory, "/dev/null"])
-            with open(directory + "/Packages", "wb") as fh:
+            with open(directory + "/Packages", "w") as fh:
                 fh.write(st)
             bt = backtick(["gzip", "-9c", directory + "/Packages"])
             with open(directory + "/Packages.gz", "wb") as fh:
@@ -640,8 +639,8 @@ Description: MongoDB packages
     os.chdir(repo + "../../")
     s2 = backtick(["apt-ftparchive", "release", "."])
     try:
-        with open("Release", 'wb') as fh:
-            fh.write(s1.encode('utf-8'))
+        with open("Release", 'w') as fh:
+            fh.write(s1)
             fh.write(s2)
     finally:
         os.chdir(oldpwd)
@@ -663,7 +662,7 @@ def move_repos_into_place(src, dst):  # pylint: disable=too-many-branches
             os.mkdir(dname)
             break
         except OSError:
-            exc = sys.exc_info()[1]
+            exc = sys.exc_value
             if exc.errno == errno.EEXIST:
                 pass
             else:
@@ -683,7 +682,7 @@ def move_repos_into_place(src, dst):  # pylint: disable=too-many-branches
             os.symlink(dname, tmpnam)
             break
         except OSError:  # as exc: # Python >2.5
-            exc = sys.exc_info()[1]
+            exc = sys.exc_value
             if exc.errno == errno.EEXIST:
                 pass
             else:
@@ -701,7 +700,7 @@ def move_repos_into_place(src, dst):  # pylint: disable=too-many-branches
                 os.symlink(os.readlink(dst), oldnam)
                 break
             except OSError:  # as exc: # Python >2.5
-                exc = sys.exc_info()[1]
+                exc = sys.exc_value
                 if exc.errno == errno.EEXIST:
                     pass
                 else:
@@ -718,10 +717,9 @@ def write_debian_changelog(path, spec, srcdir):
     os.chdir(srcdir)
     preamble = ""
     try:
-        sb = preamble + backtick([
-            "sh", "-c",
-            "git archive %s debian/changelog | tar xOf -" % spec.metadata_gitspec()
-        ]).decode('utf-8')
+        sb = preamble + backtick(
+            ["sh", "-c",
+             "git archive %s debian/changelog | tar xOf -" % spec.metadata_gitspec()])
     finally:
         os.chdir(oldcwd)
     lines = sb.split("\n")
@@ -771,7 +769,49 @@ def make_rpm(distro, build_os, arch, spec, srcdir):  # pylint: disable=too-many-
     for subdir in ["BUILD", "RPMS", "SOURCES", "SPECS", "SRPMS"]:
         ensure_dir("%s/%s/" % (topdir, subdir))
     distro_arch = distro.archname(arch)
-
+    # RPM tools take these macro files that define variables in
+    # RPMland.  Unfortunately, there's no way to tell RPM tools to use
+    # a given file *in addition* to the files that it would already
+    # load, so we have to figure out what it would normally load,
+    # augment that list, and tell RPM to use the augmented list.  To
+    # figure out what macrofiles ordinarily get loaded, older RPM
+    # versions had a parameter called "macrofiles" that could be
+    # extracted from "rpm --showrc".  But newer RPM versions don't
+    # have this.  To tell RPM what macros to use, older versions of
+    # RPM have a --macros option that doesn't work; on these versions,
+    # you can put a "macrofiles" parameter into an rpmrc file.  But
+    # that "macrofiles" setting doesn't do anything for newer RPM
+    # versions, where you have to use the --macros flag instead.  And
+    # all of this is to let us do our work with some guarantee that
+    # we're not clobbering anything that doesn't belong to us.
+    #
+    # On RHEL systems, --rcfile will generally be used and
+    # --macros will be used in Ubuntu.
+    #
+    macrofiles = [
+        l for l in backtick(["rpm", "--showrc"]).split("\n") if l.startswith("macrofiles")
+    ]
+    flags = []
+    macropath = os.getcwd() + "/macros"
+
+    write_rpm_macros_file(macropath, topdir, distro.release_dist(build_os))
+    if macrofiles:
+        macrofiles = macrofiles[0] + ":" + macropath
+        rcfile = os.getcwd() + "/rpmrc"
+        write_rpmrc_file(rcfile, macrofiles)
+        flags = ["--rcfile", rcfile]
+    else:
+        # This hard-coded hooey came from some box running RPM
+        # 4.4.2.3.  It may not work over time, but RPM isn't sanely
+        # configurable.
+        flags = [
+            "--macros",
+            "/usr/lib/rpm/macros:/usr/lib/rpm/%s-linux/macros:/usr/lib/rpm/suse/macros:/etc/rpm/macros.*:/etc/rpm/macros:/etc/rpm/%s-linux/macros:~/.rpmmacros:%s"
+            % (distro_arch, distro_arch, macropath)
+        ]
+    # Put the specfile and the tar'd up binaries and stuff in
+    # place.
+    #
     # The version of rpm and rpm tools in RHEL 5.5 can't interpolate the
     # %{dynamic_version} macro, so do it manually
     with open(specfile, "r") as spec_source:
@@ -793,18 +833,10 @@ def make_rpm(distro, build_os, arch, spec, srcdir):  # pylint: disable=too-many-
         os.chdir(oldcwd)
     # Do the build.
 
-    flags = [
-        "-D",
-        "_topdir " + topdir,
-        "-D",
-        "dist ." + distro.release_dist(build_os),
-        "-D",
-        "_use_internal_dependency_generator 0",
-        "-D",
-        "dynamic_version " + spec.pversion(distro),
-        "-D",
-        "dynamic_release " + spec.prelease(),
-    ]
+    flags.extend([
+        "-D", "dynamic_version " + spec.pversion(distro), "-D",
+        "dynamic_release " + spec.prelease(), "-D", "_topdir " + topdir
+    ])
 
     # Versions of RPM after 4.4 ignore our BuildRoot tag so we need to
     # specify it on the command line args to rpmbuild
@@ -835,13 +867,27 @@ def make_rpm_repo(repo):
         os.chdir(oldpwd)
 
 
+def write_rpmrc_file(path, string):
+    """Write the RPM rc file."""
+    with open(path, 'w') as fh:
+        fh.write(string)
+
+
+def write_rpm_macros_file(path, topdir, release_dist):
+    """Write the RPM macros file."""
+    with open(path, 'w') as fh:
+        fh.write("%%_topdir	%s\n" % topdir)
+        fh.write("%%dist	.%s\n" % release_dist)
+        fh.write("%_use_internal_dependency_generator 0\n")
+
+
 def ensure_dir(filename):
     """Ensure that the dirname directory of filename exists, and return filename."""
     dirpart = os.path.dirname(filename)
     try:
         os.makedirs(dirpart)
     except OSError:  # as exc: # Python >2.5
-        exc = sys.exc_info()[1]
+        exc = sys.exc_value
         if exc.errno == errno.EEXIST:
             pass
         else:
diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec
index dd7b03f1b27..20b55bbc9c7 100644
--- a/rpm/mongodb-enterprise-init.spec
+++ b/rpm/mongodb-enterprise-init.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-enterprise
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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: mongodb-enterprise-unstable, mongo-enterprise-unstable, mongo-10gen-enterprise
 Provides: mongo-10gen-enterprise
@@ -25,22 +11,11 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-enterprise-server = %{version}, mongodb-enterprise-shell = %{version}, mongodb-enterprise-mongos = %{version}, mongodb-enterprise-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
@@ -192,33 +167,27 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-cp -v rpm/init.d-mongod $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-chmod a+x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+cp -v rpm/init.d-mongod $RPM_BUILD_ROOT/etc/init.d/mongod
+chmod a+x $RPM_BUILD_ROOT/etc/init.d/mongod
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -253,15 +222,15 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_sysconfdir}/init.d/mongod
-%config(noreplace) %{_sysconfdir}/sysconfig/mongod
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/etc/init.d/mongod
+%config(noreplace) /etc/sysconfig/mongod
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc snmp/MONGOD-MIB.txt
 %doc snmp/MONGODBINC-MIB.txt
 %doc snmp/mongod.conf.master
diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec
index ecb4b258077..286a1e53dcb 100644
--- a/rpm/mongodb-enterprise-unstable-init.spec
+++ b/rpm/mongodb-enterprise-unstable-init.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-enterprise-unstable
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Obsoletes: mongodb-enterprise-unstable,mongo-enterprise-unstable
 Version: %{dynamic_version}
@@ -24,22 +10,11 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-enterprise-unstable-server = %{version}, mongodb-enterprise-unstable-shell = %{version}, mongodb-enterprise-unstable-mongos = %{version}, mongodb-enterprise-unstable-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
@@ -181,33 +156,27 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-cp -v rpm/init.d-mongod $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-chmod a+x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+cp -v rpm/init.d-mongod $RPM_BUILD_ROOT/etc/init.d/mongod
+chmod a+x $RPM_BUILD_ROOT/etc/init.d/mongod
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 
 
@@ -244,15 +213,15 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_sysconfdir}/init.d/mongod
-%config(noreplace) %{_sysconfdir}/sysconfig/mongod
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/etc/init.d/mongod
+%config(noreplace) /etc/sysconfig/mongod
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc snmp/MONGOD-MIB.txt
 %doc snmp/MONGODBINC-MIB.txt
 %doc snmp/mongod.conf.master
diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec
index 36bf9338b23..5e1bcee397d 100644
--- a/rpm/mongodb-enterprise-unstable.spec
+++ b/rpm/mongodb-enterprise-unstable.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-enterprise-unstable
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Obsoletes: mongodb-enterprise-unstable,mongo-enterprise-unstable
 Version: %{dynamic_version}
@@ -24,24 +10,15 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-enterprise-unstable-server = %{version}, mongodb-enterprise-unstable-shell = %{version}, mongodb-enterprise-unstable-mongos = %{version}, mongodb-enterprise-unstable-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
+%define python_pkg python2
 %endif
 
 %description
@@ -65,15 +42,9 @@ This metapackage will install the mongo shell, import/export tools, other client
 %package server
 Summary: MongoDB database server (enterprise)
 Group: Applications/Databases
-Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}
+Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}, %{python_pkg}
 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
-
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 700 || 0%{?fedora} >= 15
-BuildRequires: systemd-rpm-macros
-%else
 BuildRequires: systemd
-%{?systemd_requires}
-%endif
 
 %description server
 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.
@@ -188,30 +159,24 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp -v rpm/mongod.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+cp -v rpm/mongod.service $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 
 
@@ -253,14 +218,14 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_unitdir}/mongod.service
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/lib/systemd/system/mongod.service
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc snmp/MONGOD-MIB.txt
 %doc snmp/MONGODBINC-MIB.txt
 %doc snmp/mongod.conf.master
diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec
index 2a7507345b8..2cfbb9370c2 100644
--- a/rpm/mongodb-enterprise.spec
+++ b/rpm/mongodb-enterprise.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-enterprise
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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: mongodb-enterprise-unstable, mongo-enterprise-unstable, mongo-10gen-enterprise
 Provides: mongo-10gen-enterprise
@@ -25,24 +11,15 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-enterprise-server = %{version}, mongodb-enterprise-shell = %{version}, mongodb-enterprise-mongos = %{version}, mongodb-enterprise-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
+%define python_pkg python2
 %endif
 
 %description
@@ -66,18 +43,11 @@ This metapackage will install the mongo shell, import/export tools, other client
 %package server
 Summary: MongoDB database server (enterprise)
 Group: Applications/Databases
-Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}
+Requires: openssl, net-snmp, cyrus-sasl, cyrus-sasl-plain, cyrus-sasl-gssapi, %{timezone_pkg}, %{python_pkg}
 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-server
 Provides: mongo-10gen-enterprise-server
 
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 700 || 0%{?fedora} >= 15
-BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: systemd
-%{?systemd_requires}
-%endif
-
 %description server
 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.
 
@@ -199,30 +169,25 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp -v rpm/mongod.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+cp -v rpm/mongod.service $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -260,14 +225,14 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_unitdir}/mongod.service
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/lib/systemd/system/mongod.service
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc snmp/MONGOD-MIB.txt
 %doc snmp/MONGODBINC-MIB.txt
 %doc snmp/mongod.conf.master
diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec
index 324f7475a06..792123388c1 100644
--- a/rpm/mongodb-org-init.spec
+++ b/rpm/mongodb-org-init.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-org
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Version: %{dynamic_version}
 Release: %{dynamic_release}%{?dist}
@@ -25,22 +11,11 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-org-server = %{version}, mongodb-org-shell = %{version}, mongodb-org-mongos = %{version}, mongodb-org-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
@@ -192,33 +167,27 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-cp -v rpm/init.d-mongod $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-chmod a+x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+cp -v rpm/init.d-mongod $RPM_BUILD_ROOT/etc/init.d/mongod
+chmod a+x $RPM_BUILD_ROOT/etc/init.d/mongod
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -253,15 +222,15 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_sysconfdir}/init.d/mongod
-%config(noreplace) %{_sysconfdir}/sysconfig/mongod
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/etc/init.d/mongod
+%config(noreplace) /etc/sysconfig/mongod
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc LICENSE-Community.txt
 %doc README
 %doc THIRD-PARTY-NOTICES
diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec
index 86726d6f432..445ddb27108 100644
--- a/rpm/mongodb-org-unstable-init.spec
+++ b/rpm/mongodb-org-unstable-init.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-org-unstable
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Version: %{dynamic_version}
 Release: %{dynamic_release}%{?dist}
@@ -23,22 +9,11 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-org-unstable-server = %{version}, mongodb-org-unstable-shell = %{version}, mongodb-org-unstable-mongos = %{version}, mongodb-org-unstable-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
@@ -180,33 +155,27 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-cp -v rpm/init.d-mongod $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-chmod a+x $RPM_BUILD_ROOT%{_sysconfdir}/init.d/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mongod
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+cp -v rpm/init.d-mongod $RPM_BUILD_ROOT/etc/init.d/mongod
+chmod a+x $RPM_BUILD_ROOT/etc/init.d/mongod
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+cp -v rpm/mongod.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/mongod
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 
 
@@ -243,15 +212,15 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_sysconfdir}/init.d/mongod
-%config(noreplace) %{_sysconfdir}/sysconfig/mongod
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/etc/init.d/mongod
+%config(noreplace) /etc/sysconfig/mongod
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc LICENSE-Community.txt
 %doc README
 %doc THIRD-PARTY-NOTICES
diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec
index f1d9e92a497..b9b6b13b5fc 100644
--- a/rpm/mongodb-org-unstable.spec
+++ b/rpm/mongodb-org-unstable.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-org-unstable
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Version: %{dynamic_version}
 Release: %{dynamic_release}%{?dist}
@@ -23,24 +9,15 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-org-unstable-server = %{version}, mongodb-org-unstable-shell = %{version}, mongodb-org-unstable-mongos = %{version}, mongodb-org-unstable-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
+%define python_pkg python2
 %endif
 
 %description
@@ -64,16 +41,9 @@ 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}
+Requires: openssl, %{timezone_pkg}, %{python_pkg}
 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
 
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 700 || 0%{?fedora} >= 15
-BuildRequires: systemd-rpm-macros
-%else
-BuildRequires: systemd
-%{?systemd_requires}
-%endif
-
 %description server
 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.
 
@@ -187,30 +157,26 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp -v rpm/mongod.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+cp -v rpm/mongod.service $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -249,14 +215,14 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_unitdir}/mongod.service
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/lib/systemd/system/mongod.service
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc LICENSE-Community.txt
 %doc README
 %doc THIRD-PARTY-NOTICES
diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec
index 04e30c9e306..9a94cd6086b 100644
--- a/rpm/mongodb-org.spec
+++ b/rpm/mongodb-org.spec
@@ -1,19 +1,5 @@
-%if 0%{?suse_version}
-%define _sharedstatedir %{_localstatedir}/lib
-%endif
-
-%if ! %{defined _docdir}
-%define _docdir %{_datadir}/doc
-%endif
-
-%if ! %{defined _rundir}
-%define _rundir %{_localstatedir}/run
-%endif
-
 Name: mongodb-org
 Prefix: /usr
-Prefix: /var
-Prefix: /etc
 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
 Version: %{dynamic_version}
 Release: %{dynamic_release}%{?dist}
@@ -25,24 +11,15 @@ URL: http://www.mongodb.org
 Group: Applications/Databases
 Requires: mongodb-org-server = %{version}, mongodb-org-shell = %{version}, mongodb-org-mongos = %{version}, mongodb-org-tools = %{version}
 
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-BuildRequires: /usr/bin/pathfix.py, python3-devel
-%endif
-
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%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
+%define python_pkg python2
 %endif
 
 %description
@@ -66,7 +43,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}
+Requires: openssl, %{timezone_pkg}, %{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
 Obsoletes: mongo-10gen-server
 Provides: mongo-10gen-server
@@ -192,30 +169,24 @@ MongoDB features:
 
 This package provides the MongoDB static library and header files needed to develop MongoDB client software.
 
-#Release builds have no debug symbols, and this prevents packaging errors on RHEL 8.0
-%global debug_package %{nil}
-
 %prep
 %setup
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" bin/install_compass
-%endif
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_prefix}
-cp -rv bin $RPM_BUILD_ROOT%{_prefix}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp debian/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-cp -v rpm/mongod.conf $RPM_BUILD_ROOT%{_sysconfdir}/mongod.conf
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-cp -v rpm/mongod.service $RPM_BUILD_ROOT%{_unitdir}
-mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/mongo
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb
-mkdir -p $RPM_BUILD_ROOT%{_rundir}/mongodb
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/mongodb/mongod.log
+mkdir -p $RPM_BUILD_ROOT/usr
+cp -rv bin $RPM_BUILD_ROOT/usr
+mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
+cp debian/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
+mkdir -p $RPM_BUILD_ROOT/etc
+cp -v rpm/mongod.conf $RPM_BUILD_ROOT/etc/mongod.conf
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+cp -v rpm/mongod.service $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT/var/lib/mongo
+mkdir -p $RPM_BUILD_ROOT/var/log/mongodb
+mkdir -p $RPM_BUILD_ROOT/var/run/mongodb
+touch $RPM_BUILD_ROOT/var/log/mongodb/mongod.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -254,14 +225,14 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/mongod.conf
+%config(noreplace) /etc/mongod.conf
 %{_bindir}/mongod
 %{_mandir}/man1/mongod.1*
-%{_unitdir}/mongod.service
-%attr(0755,mongod,mongod) %dir %{_sharedstatedir}/mongo
-%attr(0755,mongod,mongod) %dir %{_localstatedir}/log/mongodb
-%attr(0755,mongod,mongod) %dir %{_rundir}/mongodb
-%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mongodb/mongod.log
+/lib/systemd/system/mongod.service
+%attr(0755,mongod,mongod) %dir /var/lib/mongo
+%attr(0755,mongod,mongod) %dir /var/log/mongodb
+%attr(0755,mongod,mongod) %dir /var/run/mongodb
+%attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log
 %doc LICENSE-Community.txt
 %doc README
 %doc THIRD-PARTY-NOTICES