From 38903b2e5fdc5a6cb24054bdcc67876389316f8faea554a4cbb7c00f512b4f04 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 2 May 2018 14:02:08 +0000 Subject: [PATCH 1/2] Accepting request 602555 from home:dimstar:Factory - Require update-alternatives by postgresql: one of the main scripts in use is install-alternatives, which calls u-a. OBS-URL: https://build.opensuse.org/request/show/602555 OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=101 --- postgresql.changes | 6 ++++++ postgresql.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/postgresql.changes b/postgresql.changes index 8d1f4a7..55d05db 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 30 13:26:49 UTC 2018 - dimstar@opensuse.org + +- Require update-alternatives by postgresql: one of the main + scripts in use is install-alternatives, which calls u-a. + ------------------------------------------------------------------- Wed Jan 17 16:48:57 UTC 2018 - max@suse.com diff --git a/postgresql.spec b/postgresql.spec index ed6ce24..81a00db 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -38,6 +38,7 @@ Url: https://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql-noarch = %version-%release Requires: postgresql-implementation +Requires: update-alternatives Recommends: %defaultpackage BuildArch: noarch Source0: postgresql-init From 9be996bc7014496bf5eded2b51377811840d54e6cbb1550e7cdb2b68c8cb380e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 2 May 2018 15:35:49 +0000 Subject: [PATCH 2/2] - Put POSTGRES_LANG into LC_ALL instead of LANG to retain the previous behaviour of that variable (boo#1077027). OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=102 --- postgresql-script | 2 +- postgresql.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/postgresql-script b/postgresql-script index 566bab3..b4842da 100644 --- a/postgresql-script +++ b/postgresql-script @@ -43,7 +43,7 @@ cd ~ case "$1" in start) if [ ! -f $DATADIR/PG_VERSION ]; then - LANG=${POSTGRES_LANG:-$LANG} + test -n "$POSTGRES_LANG" && export LC_ALL="$POSTGRES_LANG" V=$(printf "%02d%02d" $(echo $VERSION|awk -F. '{print $1, $2}')) install -d -m 700 ${DATADIR} && echo "Initializing PostgreSQL $VERSION at location ${DATADIR}" diff --git a/postgresql.changes b/postgresql.changes index 55d05db..ff928b2 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -4,6 +4,12 @@ Mon Apr 30 13:26:49 UTC 2018 - dimstar@opensuse.org - Require update-alternatives by postgresql: one of the main scripts in use is install-alternatives, which calls u-a. +------------------------------------------------------------------- +Fri Feb 2 10:03:33 UTC 2018 - max@suse.com + +- Put POSTGRES_LANG into LC_ALL instead of LANG to retain the + previous behaviour of that variable (boo#1077027). + ------------------------------------------------------------------- Wed Jan 17 16:48:57 UTC 2018 - max@suse.com