RPM: update opensuse dependencies to postgresql

Signed-off-by: François Andriot <albator78@libertysurf.fr>

10 files changed, 25 insertions, 35 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index b6712c9cc..cf87f272c 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -167,7 +167,7 @@ libbeagle:
 	$(call buildpkg,3rdparty/libbeagle)
 
 mp4v2:
-ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .oss154 .osstw ))
+ifneq (,$(filter $(DIST), .el9 .oss151 .oss152 .oss153 .osstw ))
 	$(call buildpkg,3rdparty/mp4v2)
 endif
 
diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index 5609d2f65..e2f5fa46d 100644
--- a/redhat/applications/misc/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -79,17 +79,12 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	mysql-devel
 
 # POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires:	postgresql10
-BuildRequires:	postgresql10-devel
-%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # SQLITE support
 BuildRequires:	sqlite-devel
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index 8cb752935..d0aa408ce 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -111,17 +111,12 @@ BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
 
 # POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires:	postgresql10
-BuildRequires:	postgresql10-devel
-%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index d76dea71d..e137cc9b9 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -220,7 +220,8 @@ BuildRequires:	trinity-poppler-devel >= 0.12
 %if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
 %if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550 && 0%{?pclinuxos} == 0
 %define with_postgresql 1
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires:	postgresql-server-devel
 %else
 BuildRequires:	postgresql-devel
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index 9d640f25e..4d79d2247 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -268,17 +268,12 @@ BuildRequires: sqlite3-devel
 %endif
 
 # POSTGRESQL support
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
-BuildRequires:	postgresql10
-BuildRequires:	postgresql10-devel
-%else
-BuildRequires: postgresql
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
+BuildRequires:	postgresql
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 BuildRequires: postgresql-server-devel
 %else
 BuildRequires: postgresql-devel
 %endif
-%endif
 
 # Firebird support
 %if 0%{?mdkversion} || 0%{?mgaversion}
diff --git a/redhat/docker/oss152/packages b/redhat/docker/oss152/packages
index 0fd341899..ec21f7f6b 100644
--- a/redhat/docker/oss152/packages
+++ b/redhat/docker/oss152/packages
@@ -163,8 +163,8 @@ perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 pkgconfig(pygtk-2.0)
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
 python-devel
 python3-devel
 python-sip-devel
diff --git a/redhat/docker/oss153/Dockerfile.x86_64 b/redhat/docker/oss153/Dockerfile.x86_64
index fddd4f5eb..5931d6e4c 100644
--- a/redhat/docker/oss153/Dockerfile.x86_64
+++ b/redhat/docker/oss153/Dockerfile.x86_64
@@ -12,7 +12,6 @@ RUN set -x \
  && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.3/ packman \
  && zypper refresh \
  && zypper -n install libudisks2-0-devel-2.8.1-1.39.x86_64 \
- && zypper -n install postgresql10{,-devel,-server}-10.17-8.35.1.x86_64 \
  && zypper -n update \
  && zypper -n install -l $(</packages)
 
diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
index 2600fac56..0a3e3f436 100644
--- a/redhat/docker/oss154/Dockerfile.x86_64
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -9,11 +9,9 @@ COPY packages /packages
 RUN set -x \
  && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
  && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
- && rm -fv /etc/zypp/repos.d/repo-sle-* \
  && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
- && zypper refresh \
+ && zypper -n refresh \
  && zypper -n update \
- && zypper -n install --oldpackage libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-2_4-2-2.4.46-150200.14.5.1.x86_64 libldap-data-2.4.46-150200.14.5.1.noarch \
  && zypper -n install -l $(</packages)
 
 RUN ln -sfv python3 /usr/bin/python
@@ -33,7 +31,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
 
 # Install heimdal development files
 RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.4/repo/oss/src/libheimdal-7.7.0-bp154.1.43.src.rpm \
- && wget -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://objects.githubusercontent.com/github-production-release-asset-2e65be/319333/be127800-88cf-11e9-901a-8182ad5b94e1?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20230410%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230410T153423Z&X-Amz-Expires=300&X-Amz-Signature=9ceafbdc1252b40abdbec062b63dcb444ecd91c4dcad13f96a27faed69f04546&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=319333&response-content-disposition=attachment%3B%20filename%3Dheimdal-7.7.0.tar.gz&response-content-type=application%2Foctet-stream" \
+ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.7.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.7.0/heimdal-7.7.0.tar.gz" \
  && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.7.0.tar.gz|" -e "/^%patch0/ s|^%|#|" \
  && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \
  && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.7.0/tools/ install
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
index 751eba0af..324cad2de 100644
--- a/redhat/docker/oss154/packages
+++ b/redhat/docker/oss154/packages
@@ -105,6 +105,7 @@ liblrdf-devel
 libmad-devel
 libmng-devel
 libmp3lame-devel
+libmp4v2-devel
 libmpcdec-devel
 libmtp-devel
 libmusicbrainz-devel 
@@ -177,12 +178,14 @@ patch
 pciutils-devel
 pcre-devel
 pcsc-lite-devel
+perl(JSON)
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
 polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
 python3-devel
 python3-sip-devel
 recode
@@ -200,6 +203,7 @@ subversion-devel
 sudo
 swig
 sword-devel
+texinfo
 torsocks
 transfig
 unixODBC-devel
@@ -208,6 +212,7 @@ usbutils
 utempter-devel
 valgrind
 vim
+wget
 wireless-tools
 wv2-devel
 xbase-devel
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 971fc4d37..263bd6947 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -9,7 +9,6 @@ bison
 bluez-devel
 boost-devel
 brp-check-suse
-brp-extract-appdata
 ccache
 cdparanoia
 cdparanoia-devel
@@ -39,6 +38,7 @@ ffmpeg-4-libavcodec-devel
 ffmpeg-4-libavdevice-devel
 fftw3-devel
 file-devel
+findutils
 flac-devel
 flex
 font-util
@@ -183,8 +183,9 @@ perl-pcsc
 pkcs11-helper-devel
 pkgconfig(guile-1.8)
 polkit-devel
-postgresql10
-postgresql10-devel
+postgresql
+postgresql-devel
+postgresql-server-devel
 potrace-devel
 ppp
 python-devel
@@ -230,6 +231,7 @@ usbutils
 utempter-devel
 valgrind
 vim
+wget
 wireless-tools
 wv2-devel
 xcb-proto-devel