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
This commit is contained in:
David Anes 2022-04-12 13:24:38 +00:00 committed by Git OBS Bridge
parent 6b8302156e
commit 4033db0798
3 changed files with 13 additions and 6 deletions

View File

@ -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" \

View File

@ -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>

View File

@ -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