diff --git a/_service b/_service
index e8c4679..590732d 100644
--- a/_service
+++ b/_service
@@ -1,10 +1,23 @@
+
+ git
+ https://github.com/bitwarden/clients.git
+ desktop-v2023.3.0
+ 2023.3.0
+ bitwarden
+ bitwarden_license/*
+
+ apps/browser/*
+ apps/cli/*
+ apps/web/*
+
+
- bitwarden/apps/desktop/desktop_native
+ clients/apps/desktop/desktop_native
false
- bitwarden/apps/desktop/desktop_native
+ clients/apps/desktop/desktop_native
diff --git a/bitwarden-2023.2.0.tar.zst b/bitwarden-2023.2.0.tar.zst
deleted file mode 100644
index 166e965..0000000
--- a/bitwarden-2023.2.0.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a99de70434eae132cdf60f4caa7c8155b3ae55b96ae800f65e67bd505503c41b
-size 38800282
diff --git a/bitwarden-2023.3.0.obscpio b/bitwarden-2023.3.0.obscpio
new file mode 100644
index 0000000..2e43cab
--- /dev/null
+++ b/bitwarden-2023.3.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2759d85fec6bbc01224a5e6fd713751d91539e21dc43bee1dbdf4b2c5258b400
+size 19841037
diff --git a/bitwarden.changes b/bitwarden.changes
index 43ebd1c..00454ed 100644
--- a/bitwarden.changes
+++ b/bitwarden.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 22 19:34:04 UTC 2023 - Bruno Pitrus
+- New upstream release 2023.3.0
+ * Restyle generator panel to be panel-like and avoid overflowing
+- Use obs-scm service for downloading clean tarball and package node vendor separately.
+
-------------------------------------------------------------------
Sat Feb 18 21:37:59 UTC 2023 - Bruno Pitrus
- Remove use of local-npm-proxy and cleanup tarball from prebuilt blobs
diff --git a/bitwarden.obsinfo b/bitwarden.obsinfo
new file mode 100644
index 0000000..4bf7b9a
--- /dev/null
+++ b/bitwarden.obsinfo
@@ -0,0 +1,4 @@
+name: bitwarden
+version: 2023.3.0
+mtime: 1679496512
+commit: 7f25f5f6ecc47ae3354b60e6ba6158f8be185a8d
diff --git a/bitwarden.spec b/bitwarden.spec
index 6f030bc..4a787eb 100644
--- a/bitwarden.spec
+++ b/bitwarden.spec
@@ -19,7 +19,7 @@
Name: bitwarden
-Version: 2023.2.0
+Version: 2023.3.0
Release: 0
Summary: A secure and free password manager for all of your devices
Group: Productivity/Security
@@ -36,8 +36,11 @@ BuildArch: i686
%define version_suffix desktop
-# created by create-tarball.sh
-Source0: bitwarden-%{version}.tar.zst
+# created by OBS service
+Source0: bitwarden-%{version}.tar
+
+# created by prepare-node-vendor.sh
+Source1: node-vendor.tar.zst
Source2: bitwarden.sh
Source3: bitwarden.desktop
@@ -45,12 +48,12 @@ Source3: bitwarden.desktop
Source4: vendor.tar.zst
Source5: cargo_config
-Source99: create-tarball.sh
+Source99: prepare-node-vendor.sh
+
-#this one is already applied in tarball
-Source100: remove-unnecessary-deps.patch
#openSUSE-specific patches
+Patch0: remove-unnecessary-deps.patch
Patch1: fix-desktop-file.patch
Patch3: do-not-install-font-privately.patch
Patch4: desktop_native-rust-arch.patch
@@ -96,7 +99,7 @@ Requires: nodejs-electron%{_isa}
Bitwarden is a free and open-source password management service that stores sensitive information such as website credentials in an encrypted vault. Bitwarden offers a cloud-hosted service as well as the ability to deploy the solution on-premises. This package provides the GUI client.
%prep
-%autosetup -n bitwarden -p1
+%autosetup -p1 -a1
# Remove unused postinstall script (electron-rebuild)
@@ -206,7 +209,7 @@ cp -plvr '../../../node_modules/@phc' -t node_modules/
%install
-cd %{_builddir}/bitwarden/apps/desktop
+cd %{_builddir}/bitwarden-%{version}/apps/desktop
mkdir -pv %{buildroot}%{_libdir}
cp -plr build %{buildroot}%{_libdir}/%{name}
for i in 16 32 64 128 256 512 1024
diff --git a/node-vendor.tar.zst b/node-vendor.tar.zst
new file mode 100644
index 0000000..f702285
--- /dev/null
+++ b/node-vendor.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:802906cdcf057fc053143b8bcea9898f5df62756c72e63d2a5db44aa42234d5b
+size 33819765
diff --git a/create-tarball.sh b/prepare-node-vendor.sh
similarity index 73%
rename from create-tarball.sh
rename to prepare-node-vendor.sh
index 6d2e2d6..0a24b5a 100644
--- a/create-tarball.sh
+++ b/prepare-node-vendor.sh
@@ -3,21 +3,13 @@
# dnf install curl gzip jq npm patch tar wget
PKGDIR="$(pwd)"
-TMPDIR="$(mktemp --tmpdir -d bitwarden-XXXXXXXX)"
-
-version=2023.2.0
-tag=desktop
-cd $TMPDIR
-
-curl -L https://github.com/bitwarden/clients/archive/${tag}-v${version}.tar.gz |tar --gzip -xvvf -
-
-cd clients-${tag}-v${version}
+cd clients
@@ -51,21 +43,11 @@ find -type f | sponge | xargs -P$(nproc) -- sh -c 'file -S "$@" | grep -v '\'' .
echo ">>>>>> Remove empty directories"
find . -type d -empty -print -delete
-cd ..
-mv -v clients-${tag}-v${version} bitwarden
-
-echo ">>>>>> Hardlink duplicate files to reduce extraction time"
-
-/usr/lib/rpm/fdupes_wrapper bitwarden
echo ">>>>>> Create tarball"
-ZSTD_CLEVEL=19 ZSTD_NBTHREADS=$(nproc) tar --zstd --sort=name -vvScf "${PKGDIR}/bitwarden-${version}.tar.zst" bitwarden
+ZSTD_CLEVEL=19 ZSTD_NBTHREADS=$(nproc) tar --zstd --sort=name -vvScf "${PKGDIR}/node-vendor.tar.zst" node_modules
if [ $? -ne 0 ]; then
echo "ERROR: tar cf failed"
cleanup_and_exit 1
fi
-
-
-
-#Run `osc service disabledrun` to regenerate vendor.tar.xz
\ No newline at end of file
diff --git a/remove-unnecessary-deps.patch b/remove-unnecessary-deps.patch
index ee09260..c768b8c 100644
--- a/remove-unnecessary-deps.patch
+++ b/remove-unnecessary-deps.patch
@@ -178,3 +178,15 @@
"react": "^18.0.0"
},
"lint-staged": {
+--- a/apps/desktop/desktop_native/package.json
++++ b/apps/desktop/desktop_native/package.json
+@@ -10,9 +10,6 @@
+ },
+ "author": "",
+ "license": "GPL-3.0",
+- "devDependencies": {
+- "@napi-rs/cli": "^2.6.2"
+- },
+ "napi": {
+ "name": "desktop_native",
+ "triples": {