From 6b8302156e58b5f08e1b525144914347c152ff20eb58acf6ddf13446458e32e9 Mon Sep 17 00:00:00 2001
From: Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
Date: Fri, 5 Nov 2021 13:10:01 +0000
Subject: [PATCH 1/3] Accepting request 929659 from home:schubi2

- Use libalternatives instead of update-alternatives.

OBS-URL: https://build.opensuse.org/request/show/929659
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdb-4_8?expand=0&rev=61
---
 libdb-4_8.changes   |  5 ++++
 libdb-4_8.spec      | 61 ++++++++++++++++++++++++++++++++++++++++++++-
 libdb_java-4_8.spec |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/libdb-4_8.changes b/libdb-4_8.changes
index 433bede..7eba641 100644
--- a/libdb-4_8.changes
+++ b/libdb-4_8.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 19 11:46:55 UTC 2021 - Stefan Schubert <schubi@suse.de>
+
+- Use libalternatives instead of update-alternatives.
+
 -------------------------------------------------------------------
 Tue Aug 27 00:06:09 UTC 2019 - William Brown <william.brown@suse.com>
 
diff --git a/libdb-4_8.spec b/libdb-4_8.spec
index 9c1e026..1dea7d2 100644
--- a/libdb-4_8.spec
+++ b/libdb-4_8.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdb-4_8
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,12 @@
 #
 
 
+%if 0%{?suse_version} > 1500
+%bcond_without libalternatives
+%else
+%bcond_with libalternatives
+%endif
+
 %define util_list archive checkpoint deadlock dump hotbackup load printlog recover sql stat upgrade verify
 %define         generic_name db
 %define         major 4
@@ -48,7 +54,12 @@ This package contains the necessary runtime libraries.
 %package -n db48-utils
 Summary:        Command Line tools for Managing Berkeley DB Databases
 Group:          Productivity/Databases/Tools
+%if %{with libalternatives}
+Requires:       alts
+BuildRequires:  alts
+%else
 Requires(post): update-alternatives
+%endif
 Provides:       db-utils = %{version}
 Obsoletes:      db-utils < %{version}
 
@@ -164,6 +175,7 @@ mv %{buildroot}/%{_docdir}/%{name}/collections/tutorial %{buildroot}/%{_docdir}/
 # Remove crappy *.la files
 find %{buildroot} -type f -name "*.la" -delete -print
 
+%if ! %{with libalternatives}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 
 for i in %{util_list}; do
@@ -173,11 +185,29 @@ for i in %{util_list}; do
     mv "%{buildroot}/%{_bindir}/db_$i" "%{buildroot}/%{_bindir}/db48_$i"
     ln -s "%{_sysconfdir}/alternatives/db_$i" "%{buildroot}%{_bindir}/db_$i"
 done
+%else
+for i in %{util_list}; do
+    mv "%{buildroot}/%{_bindir}/db_$i" "%{buildroot}/%{_bindir}/db48_$i"
+    ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/db_$i
+    mkdir -p %{buildroot}%{_datadir}/libalternatives/db_$i
+    echo "binary=%{_bindir}/db48_$i" >%{buildroot}%{_datadir}/libalternatives/db_$i/48.conf
+done
+%endif
 
 %fdupes -s %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+
+%if %{with libalternatives}
+%pre
+# removing old update-alternatives entries
+if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
+    for i in %{util_list}; do
+	update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
+    done    
+fi    
+%else
 %post -n db48-utils
 for i in %{util_list}; do
 	update-alternatives --install "%{_bindir}/db_$i" \
@@ -188,6 +218,7 @@ done
 for i in %{util_list}; do
 	update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
 done
+%endif
 
 %files
 %{_libdir}/libdb-%{major}.%{minor}.so
@@ -210,6 +241,7 @@ done
 
 %files -n db48-utils
 %{_bindir}/db48_*
+%if ! 0%{with libalternatives}
 %ghost %{_sysconfdir}/alternatives/db_archive
 %ghost %{_sysconfdir}/alternatives/db_checkpoint
 %ghost %{_sysconfdir}/alternatives/db_deadlock
@@ -222,6 +254,33 @@ done
 %ghost %{_sysconfdir}/alternatives/db_stat
 %ghost %{_sysconfdir}/alternatives/db_upgrade
 %ghost %{_sysconfdir}/alternatives/db_verify
+%else
+%dir %{_datadir}/libalternatives
+%dir %{_datadir}/libalternatives/db_archive
+%dir %{_datadir}/libalternatives/db_checkpoint
+%dir %{_datadir}/libalternatives/db_deadlock
+%dir %{_datadir}/libalternatives/db_dump
+%dir %{_datadir}/libalternatives/db_hotbackup
+%dir %{_datadir}/libalternatives/db_load
+%dir %{_datadir}/libalternatives/db_printlog
+%dir %{_datadir}/libalternatives/db_recover
+%dir %{_datadir}/libalternatives/db_sql
+%dir %{_datadir}/libalternatives/db_stat
+%dir %{_datadir}/libalternatives/db_upgrade
+%dir %{_datadir}/libalternatives/db_verify
+%{_datadir}/libalternatives/db_archive/*
+%{_datadir}/libalternatives/db_checkpoint/*
+%{_datadir}/libalternatives/db_deadlock/*
+%{_datadir}/libalternatives/db_dump/*
+%{_datadir}/libalternatives/db_hotbackup/*
+%{_datadir}/libalternatives/db_load/*
+%{_datadir}/libalternatives/db_printlog/*
+%{_datadir}/libalternatives/db_recover/*
+%{_datadir}/libalternatives/db_sql/*
+%{_datadir}/libalternatives/db_stat/*
+ %{_datadir}/libalternatives/db_upgrade/*
+%{_datadir}/libalternatives/db_verify/*
+%endif
 %{_bindir}/db_*
 
 %files devel
diff --git a/libdb_java-4_8.spec b/libdb_java-4_8.spec
index 8e7426a..ba7e2f5 100644
--- a/libdb_java-4_8.spec
+++ b/libdb_java-4_8.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdb_java-4_8
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From 4033db0798d0a9d6ff4bb6dde10ad0a6e6e8ecd46364b59c94cceb08777a2f51 Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Tue, 12 Apr 2022 13:24:38 +0000
Subject: [PATCH 2/3] Accepting request 967821 from
 home:fstrba:branches:devel:libraries:c_c++

fix build in factory

OBS-URL: https://build.opensuse.org/request/show/967821
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdb-4_8?expand=0&rev=62
---
 libdb-4_8.spec         | 7 ++++---
 libdb_java-4_8.changes | 6 ++++++
 libdb_java-4_8.spec    | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libdb-4_8.spec b/libdb-4_8.spec
index 1dea7d2..f22a40e 100644
--- a/libdb-4_8.spec
+++ b/libdb-4_8.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdb-4_8
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -205,9 +205,10 @@ done
 if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
     for i in %{util_list}; do
 	update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
-    done    
-fi    
+    done
+fi
 %else
+
 %post -n db48-utils
 for i in %{util_list}; do
 	update-alternatives --install "%{_bindir}/db_$i" \
diff --git a/libdb_java-4_8.changes b/libdb_java-4_8.changes
index c063890..1c49a42 100644
--- a/libdb_java-4_8.changes
+++ b/libdb_java-4_8.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  8 12:39:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+  * fixes build in Factory
+
 -------------------------------------------------------------------
 Mon Aug 19 06:59:04 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/libdb_java-4_8.spec b/libdb_java-4_8.spec
index ba7e2f5..5475cc6 100644
--- a/libdb_java-4_8.spec
+++ b/libdb_java-4_8.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libdb_java-4_8
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,7 @@ Patch1:         libdb_java-4_8-fix-java10-comp.patch
 Patch2:         libdb-fix-atomic.patch
 BuildRequires:  autoconf
 BuildRequires:  gcc-c++
-BuildRequires:  java-sdk >= 1.5
+BuildRequires:  java-sdk >= 1.8
 BuildRequires:  unzip
 Requires:       libdb-%{major}_%{minor} = %{version}
 Conflicts:      libdb_java-4_5
@@ -87,7 +87,7 @@ cd ../build_nptl
         --enable-shared --disable-static \
         --enable-cxx \
         --with-mutex="POSIX/pthreads/library" \
-        --enable-java JAVACFLAGS="-source 1.6 -target 1.6" \
+        --enable-java JAVACFLAGS="-source 1.8 -target 1.8" \
 %ifarch %{arm}
         %{_target_cpu}-suse-linux-gnueabi
 %else

From c956827613fde0a8a6f6a6c2142a10d8dbe0ebbdb2a960382af7a80892022bc8 Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Wed, 13 Apr 2022 09:05:30 +0000
Subject: [PATCH 3/3] Accepting request 969767 from
 home:fstrba:branches:devel:libraries:c_c++

Revert libalternatives changes, since this is a ring0 package

OBS-URL: https://build.opensuse.org/request/show/969767
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdb-4_8?expand=0&rev=63
---
 libdb-4_8.changes |  5 ----
 libdb-4_8.spec    | 59 -----------------------------------------------
 2 files changed, 64 deletions(-)

diff --git a/libdb-4_8.changes b/libdb-4_8.changes
index 7eba641..433bede 100644
--- a/libdb-4_8.changes
+++ b/libdb-4_8.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Thu Aug 19 11:46:55 UTC 2021 - Stefan Schubert <schubi@suse.de>
-
-- Use libalternatives instead of update-alternatives.
-
 -------------------------------------------------------------------
 Tue Aug 27 00:06:09 UTC 2019 - William Brown <william.brown@suse.com>
 
diff --git a/libdb-4_8.spec b/libdb-4_8.spec
index f22a40e..9725d6d 100644
--- a/libdb-4_8.spec
+++ b/libdb-4_8.spec
@@ -16,12 +16,6 @@
 #
 
 
-%if 0%{?suse_version} > 1500
-%bcond_without libalternatives
-%else
-%bcond_with libalternatives
-%endif
-
 %define util_list archive checkpoint deadlock dump hotbackup load printlog recover sql stat upgrade verify
 %define         generic_name db
 %define         major 4
@@ -54,12 +48,7 @@ This package contains the necessary runtime libraries.
 %package -n db48-utils
 Summary:        Command Line tools for Managing Berkeley DB Databases
 Group:          Productivity/Databases/Tools
-%if %{with libalternatives}
-Requires:       alts
-BuildRequires:  alts
-%else
 Requires(post): update-alternatives
-%endif
 Provides:       db-utils = %{version}
 Obsoletes:      db-utils < %{version}
 
@@ -175,7 +164,6 @@ mv %{buildroot}/%{_docdir}/%{name}/collections/tutorial %{buildroot}/%{_docdir}/
 # Remove crappy *.la files
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%if ! %{with libalternatives}
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 
 for i in %{util_list}; do
@@ -185,30 +173,12 @@ for i in %{util_list}; do
     mv "%{buildroot}/%{_bindir}/db_$i" "%{buildroot}/%{_bindir}/db48_$i"
     ln -s "%{_sysconfdir}/alternatives/db_$i" "%{buildroot}%{_bindir}/db_$i"
 done
-%else
-for i in %{util_list}; do
-    mv "%{buildroot}/%{_bindir}/db_$i" "%{buildroot}/%{_bindir}/db48_$i"
-    ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/db_$i
-    mkdir -p %{buildroot}%{_datadir}/libalternatives/db_$i
-    echo "binary=%{_bindir}/db48_$i" >%{buildroot}%{_datadir}/libalternatives/db_$i/48.conf
-done
-%endif
 
 %fdupes -s %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%if %{with libalternatives}
-%pre
-# removing old update-alternatives entries
-if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
-    for i in %{util_list}; do
-	update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
-    done
-fi
-%else
-
 %post -n db48-utils
 for i in %{util_list}; do
 	update-alternatives --install "%{_bindir}/db_$i" \
@@ -219,7 +189,6 @@ done
 for i in %{util_list}; do
 	update-alternatives --remove "db_$i" "%{_bindir}/db_$i"
 done
-%endif
 
 %files
 %{_libdir}/libdb-%{major}.%{minor}.so
@@ -242,7 +211,6 @@ done
 
 %files -n db48-utils
 %{_bindir}/db48_*
-%if ! 0%{with libalternatives}
 %ghost %{_sysconfdir}/alternatives/db_archive
 %ghost %{_sysconfdir}/alternatives/db_checkpoint
 %ghost %{_sysconfdir}/alternatives/db_deadlock
@@ -255,33 +223,6 @@ done
 %ghost %{_sysconfdir}/alternatives/db_stat
 %ghost %{_sysconfdir}/alternatives/db_upgrade
 %ghost %{_sysconfdir}/alternatives/db_verify
-%else
-%dir %{_datadir}/libalternatives
-%dir %{_datadir}/libalternatives/db_archive
-%dir %{_datadir}/libalternatives/db_checkpoint
-%dir %{_datadir}/libalternatives/db_deadlock
-%dir %{_datadir}/libalternatives/db_dump
-%dir %{_datadir}/libalternatives/db_hotbackup
-%dir %{_datadir}/libalternatives/db_load
-%dir %{_datadir}/libalternatives/db_printlog
-%dir %{_datadir}/libalternatives/db_recover
-%dir %{_datadir}/libalternatives/db_sql
-%dir %{_datadir}/libalternatives/db_stat
-%dir %{_datadir}/libalternatives/db_upgrade
-%dir %{_datadir}/libalternatives/db_verify
-%{_datadir}/libalternatives/db_archive/*
-%{_datadir}/libalternatives/db_checkpoint/*
-%{_datadir}/libalternatives/db_deadlock/*
-%{_datadir}/libalternatives/db_dump/*
-%{_datadir}/libalternatives/db_hotbackup/*
-%{_datadir}/libalternatives/db_load/*
-%{_datadir}/libalternatives/db_printlog/*
-%{_datadir}/libalternatives/db_recover/*
-%{_datadir}/libalternatives/db_sql/*
-%{_datadir}/libalternatives/db_stat/*
- %{_datadir}/libalternatives/db_upgrade/*
-%{_datadir}/libalternatives/db_verify/*
-%endif
 %{_bindir}/db_*
 
 %files devel