fixup! fixup! Fixes #21086: Create a package for people having an ext…

…ernal DB Fixes #21086: Create a package for people having an external DB
Normation · May 25, 2022 · 1e5371a · 1e5371a
1 parent f649f2e
commit 1e5371a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/rudder-external-db/SOURCES/external-db.conf b/rudder-external-db/SOURCES/external-db.conf
@@ -1,5 +1,5 @@
 # Please fill the configuration to make sure Rudder serveur will be properly installed
-# Please ask your database administrator for those informations.
+# Please ask your database administrator for this information.
 # Some commands are provided in case you need them.
 
 # Host where rudder server must connect to access the database

diff --git a/rudder-server/SPECS/rudder-server.spec b/rudder-server/SPECS/rudder-server.spec
@@ -79,7 +79,15 @@ Obsoletes: rudder-reports < 7.2
 
 Requires: %(../format-dependencies rpm %{old_epoch}:%{real_version} rudder-agent)
 Requires: %(../format-dependencies rpm %{real_version} rudder-relay)
-Requires: (postgresql-server >= 10.3 or rudder-external-db), %{apache}, %{apache_tools}, git-core, iproute, rsync, openssl, %{ldap_clients}, curl, acl, rudder-api-client
+Requires: %{apache}, %{apache_tools}, git-core, iproute, rsync, openssl, %{ldap_clients}, curl, acl, rudder-api-client
+
+%if 0%{?rhel} && 0%{?rhel} == 7
+# rudder-external-db will not prevent installation of postgresql-server on rhel7
+Requires: postgresql-server
+%else
+# rudder-external-db must prevent installation of postgresql-server
+Requires: (postgresql-server >= 10.3 or rudder-external-db)
+%endif
 
 BuildRequires: gcc, rsync