diff --git a/docs/en_US/release_notes_5_0.rst b/docs/en_US/release_notes_5_0.rst index f78c26bf8..507dfa131 100644 --- a/docs/en_US/release_notes_5_0.rst +++ b/docs/en_US/release_notes_5_0.rst @@ -46,3 +46,4 @@ Bug fixes | `Issue #6201 `_ - Added SSL support for creating a subscription. | `Issue #6208 `_ - Fixed an issue where utility(Backup, Maintenance, ...) jobs are failing when the log level is set to DEBUG. | `Issue #6230 `_ - Fixed an issue where the user is not able to create the subscription. +| `Issue #6250 `_ - Ensure DEB/RPM packages depend on the same version of each other. diff --git a/pkg/debian/build.sh b/pkg/debian/build.sh index 360785833..e07d9dd1f 100755 --- a/pkg/debian/build.sh +++ b/pkg/debian/build.sh @@ -56,7 +56,7 @@ cat << EOF > "${DESKTOPROOT}/DEBIAN/control" Package: ${APP_NAME}-desktop Version: ${APP_LONG_VERSION} Architecture: ${OS_ARCH} -Depends: ${APP_NAME}-server, libatomic1 +Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), libatomic1 Maintainer: pgAdmin Development Team Description: The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. EOF @@ -76,7 +76,7 @@ cat << EOF > "${WEBROOT}/DEBIAN/control" Package: ${APP_NAME}-web Version: ${APP_LONG_VERSION} Architecture: all -Depends: ${APP_NAME}-server, apache2, libapache2-mod-wsgi-py3 +Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), apache2, libapache2-mod-wsgi-py3 Maintainer: pgAdmin Development Team Description: The web interface for pgAdmin, hosted under Apache HTTPD. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. EOF @@ -99,7 +99,7 @@ cat << EOF > "${METAROOT}/DEBIAN/control" Package: ${APP_NAME} Version: ${APP_LONG_VERSION} Architecture: all -Depends: ${APP_NAME}-server, ${APP_NAME}-desktop, ${APP_NAME}-web +Depends: ${APP_NAME}-server (= ${APP_LONG_VERSION}), ${APP_NAME}-desktop (= ${APP_LONG_VERSION}), ${APP_NAME}-web (= ${APP_LONG_VERSION}) Maintainer: pgAdmin Development Team Description: Installs all required components to run pgAdmin in desktop and web modes. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. EOF diff --git a/pkg/redhat/build.sh b/pkg/redhat/build.sh index 436fd22be..09a058cdf 100755 --- a/pkg/redhat/build.sh +++ b/pkg/redhat/build.sh @@ -95,7 +95,7 @@ Release: 1%{?dist} Summary: The desktop user interface for pgAdmin. License: PostgreSQL URL: https://www.pgadmin.org/ -Requires: ${APP_NAME}-server, libatomic +Requires: ${APP_NAME}-server = ${RPM_VERSION}, libatomic %description The desktop user interface for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world. @@ -144,9 +144,9 @@ Summary: The web interface for pgAdmin, hosted under Apache HTTPD. License: PostgreSQL URL: https://www.pgadmin.org/ %if 0%{?rhel} && 0%{?rhel} == 7 -Requires: ${APP_NAME}-server, httpd, pgadmin4-python3-mod_wsgi +Requires: ${APP_NAME}-server = ${RPM_VERSION}, httpd, pgadmin4-python3-mod_wsgi %else -Requires: ${APP_NAME}-server, httpd, python3-mod_wsgi +Requires: ${APP_NAME}-server = ${RPM_VERSION}, httpd, python3-mod_wsgi %endif %description @@ -190,7 +190,7 @@ BuildArch: noarch Summary: Installs all required components to run pgAdmin in desktop and web modes. License: PostgreSQL URL: https://www.pgadmin.org/ -Requires: ${APP_NAME}-server, ${APP_NAME}-desktop, ${APP_NAME}-web +Requires: ${APP_NAME}-server = ${RPM_VERSION}, ${APP_NAME}-desktop = ${RPM_VERSION}, ${APP_NAME}-web = ${RPM_VERSION} %description Installs all required components to run pgAdmin in desktop and web modes. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.