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

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

OBS-URL: https://build.opensuse.org/request/show/1073857
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/bitwarden?expand=0&rev=6

_service

@@ -1,10 +1,23 @@
 <services>
+	<service name="obs_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/bitwarden/clients.git</param>
+		<param name="revision">desktop-v2023.3.0</param>
+		<param name="version">2023.3.0</param> 
+		<param name="filename">bitwarden</param>
+		<param name="exclude">bitwarden_license/*</param>
+   <!-- The code in bitwarden_license MUST NOT be included in published tarballs as it is non-redistributable! -->
+		<param name="exclude">apps/browser/*</param>
+		<param name="exclude">apps/cli/*</param>
+		<param name="exclude">apps/web/*</param>
+	</service>
+	<service name="tar" mode="buildtime" />
 	<service name="cargo_vendor" mode="disabled">
-		<param name="srcdir">bitwarden/apps/desktop/desktop_native</param>
+		<param name="srcdir">clients/apps/desktop/desktop_native</param>
 		<param name="update">false</param>
 	</service>
 	<service name="cargo_audit" mode="disabled">
-		<param name="srcdir">bitwarden/apps/desktop/desktop_native</param>
+		<param name="srcdir">clients/apps/desktop/desktop_native</param>
 	</service>
 </services>
  

bitwarden-2023.2.0.tar.zst

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a99de70434eae132cdf60f4caa7c8155b3ae55b96ae800f65e67bd505503c41b
-size 38800282

bitwarden-2023.3.0.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2759d85fec6bbc01224a5e6fd713751d91539e21dc43bee1dbdf4b2c5258b400
+size 19841037

bitwarden.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 22 19:34:04 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
+- 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 <brunopitrus@hotmail.com>
 - Remove use of local-npm-proxy and cleanup tarball from prebuilt blobs

bitwarden.obsinfo

@@ -0,0 +1,4 @@
+name: bitwarden
+version: 2023.3.0
+mtime: 1679496512
+commit: 7f25f5f6ecc47ae3354b60e6ba6158f8be185a8d

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
+# created by OBS service
-Source0:   bitwarden-%{version}.tar.zst
+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

node-vendor.tar.zst

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:802906cdcf057fc053143b8bcea9898f5df62756c72e63d2a5db44aa42234d5b
+size 33819765

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
-cd clients-${tag}-v${version}
 
 
 
@@ -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

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": {