SHA256
1
0
forked from pool/bitwarden

Accepting request 1092610 from home:dziobian:gulgul-ultron:19

- Replace deprecated rust-packaging with cargo-packaging (boo#1211624)
- Fix unresolvable build on Fedora

OBS-URL: https://build.opensuse.org/request/show/1092610
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/bitwarden?expand=0&rev=17
This commit is contained in:
Bruno Pitrus 2023-06-12 15:24:31 +00:00 committed by Git OBS Bridge
parent f265219f31
commit 6d732fb125
2 changed files with 15 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 12 15:08:13 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
- Replace deprecated rust-packaging with cargo-packaging (boo#1211624)
- Fix unresolvable build on Fedora
-------------------------------------------------------------------
Wed May 31 17:04:02 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
- New upstream release 2023.5.0

View File

@ -25,6 +25,10 @@ Group: Productivity/Security
License: GPL-3.0-only and MIT and (Apache-2.0 or MIT)
URL: https://github.com/bitwarden/clients
%if 0%{?suse_version}
%global build_rustflags %{__rustflags}
%endif
#x86 electron requires SSE2
%ifarch %ix86
ExclusiveArch: i586 i686
@ -71,6 +75,7 @@ Patch4000: remove-esbuild-version-check.patch
#tools we use explicitly
%if 0%{?fedora_version}
%define _ttfontsdir %{_datadir}/fonts/truetype
BuildRequires: glibc-all-langpacks
%endif
%if 0%{?fedora} >= 37
BuildRequires: nodejs-npm
@ -81,7 +86,7 @@ BuildRequires: cargo
%if 0%{?fedora}
BuildRequires: rust-srpm-macros
%else
BuildRequires: rust-packaging
BuildRequires: cargo-packaging
%endif
BuildRequires: fdupes
BuildRequires: fontpackages-devel
@ -195,6 +200,9 @@ export CFLAGS="%{optflags} -fpic -fno-semantic-interposition -fvisibility=hidden
export CXXFLAGS="%{optflags} -fpic -fno-semantic-interposition -fvisibility=hidden"
export LDFLAGS="%{?build_ldflags}"
%if 0%{?suse_version}
auditable=auditable
%endif
@ -203,7 +211,7 @@ PATH="%{_builddir}/path:$PATH" npm rebuild --verbose --foreground-scripts --node
cd apps/desktop
pushd desktop_native
cargo -vv build --release
cargo -vv $auditable build --release
popd
npm run build