From 6b5986e3b7615d142181aa4dba13702e275ae60e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 25 Jun 2024 09:23:30 +0200
Subject: [PATCH] RPM: updates for OpenSuse LEAP 15.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Andriot <albator78@libertysurf.fr>
---
 redhat/Makefile                                 | 4 ++--
 redhat/applications/office/koffice/koffice.spec | 2 +-
 redhat/build/rpmdist.sh                         | 3 +++
 redhat/docker/oss156/packages                   | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/redhat/Makefile b/redhat/Makefile
index ed2805c48..278311d8b 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -295,7 +295,7 @@ kbfx: tdebase
 	$(call buildpkg,applications/system/kbfx)
 
 kbibtex: tdebase
-	#$(call buildpkg,applications/office/kbibtex)
+	$(call buildpkg,applications/office/kbibtex)
 
 kbiff: tdebase
 	$(call buildpkg,applications/internet/kbiff)
@@ -474,7 +474,7 @@ ktorrent: tdebase
 	$(call buildpkg,applications/internet/ktorrent)
 
 kvirc: tdebase
-	#$(call buildpkg,applications/internet/kvirc)
+	$(call buildpkg,applications/internet/kvirc)
 
 kvkbd: tdebase
 	$(call buildpkg,applications/system/kvkbd)
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index 9ec132b50..ee072fad4 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -1189,7 +1189,7 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
   %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
   %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
 
-%if %{?with_postgresql}
+%if "%{?with_postgresql}" != ""
 # Ensure PQXX was detected
 
 
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index d7be81993..9fdad6b6f 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -47,6 +47,9 @@ case $a in
       DIST=".oss$((read a; read a b c; echo ${c//./}) </etc/SUSE-brand)"
     elif grep -q "tumbleweed" "/etc/os-release"; then
       DIST=".osstw"
+    elif [ -r "/etc/os-release" ]; then
+      . "/etc/os-release"
+      DIST=".oss${VERSION//./}"
     else
       DIST=".oss"
     fi
diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages
index cb0acc404..8d7c5f71f 100644
--- a/redhat/docker/oss156/packages
+++ b/redhat/docker/oss156/packages
@@ -155,7 +155,6 @@ libXv-devel
 libXxf86dga-devel
 libXxf86vm-devel
 libyaz-devel
-libzrtpcpp-devel
 lirc-devel
 make
 makeinfo