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

This reverts commit 51304bb545840ef0b62a6445b1060559ab831ea1.

8 files changed, 171 insertions, 428 deletions

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