From f14a98c51a5825bd593933e981f5d6e97d8a6716366eeb248506aa3dd8731d34 Mon Sep 17 00:00:00 2001
From: Miika Alikirri <miika.alikirri@suse.com>
Date: Thu, 8 Jan 2026 09:04:20 +0200
Subject: [PATCH] Update to 0.4

This will require the bootkitd package
---
 _servicedata                  |  2 +-
 cockpit-bootloader-0.3.tar.xz |  3 ---
 cockpit-bootloader-0.4.tar.xz |  3 +++
 cockpit-bootloader.changes    |  7 +++++
 cockpit-bootloader.spec       | 51 +++--------------------------------
 vendor.tar.zst                |  3 ---
 6 files changed, 15 insertions(+), 54 deletions(-)
 delete mode 100644 cockpit-bootloader-0.3.tar.xz
 create mode 100644 cockpit-bootloader-0.4.tar.xz
 delete mode 100644 vendor.tar.zst

diff --git a/_servicedata b/_servicedata
index fdd5191..c2c670d 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/cockpit-bootloader</param>
-              <param name="changesrevision">69c7038074c22757a7dcfc640fea8f523de53239</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">a7f76079c57f0176a5f4521104134c4b9a35c73a</param></service></servicedata>
\ No newline at end of file
diff --git a/cockpit-bootloader-0.3.tar.xz b/cockpit-bootloader-0.3.tar.xz
deleted file mode 100644
index 2a9a7bd..0000000
--- a/cockpit-bootloader-0.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae0631dd691f11c28819839985c67f8383b25dff79ad8001e29d4be228dd617c
-size 2201600
diff --git a/cockpit-bootloader-0.4.tar.xz b/cockpit-bootloader-0.4.tar.xz
new file mode 100644
index 0000000..c62c124
--- /dev/null
+++ b/cockpit-bootloader-0.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a1c05674cefd8fc2763034adbfaf6aefb538cbf3c8280b7ff566b771d86bb71
+size 830796
diff --git a/cockpit-bootloader.changes b/cockpit-bootloader.changes
index e5e856d..d95f7bd 100644
--- a/cockpit-bootloader.changes
+++ b/cockpit-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 31 11:00:54 UTC 2025 - Miika Alikirri <miika.alikirri@suse.com>
+
+- Update to version 0.4:
+  * Properly depend on bootkitd package
+  * Remove unused vendor.tar.zst
+
 -------------------------------------------------------------------
 Wed Dec 17 11:26:21 UTC 2025 - Miika Alikirri <miika.alikirri@suse.com>
 
diff --git a/cockpit-bootloader.spec b/cockpit-bootloader.spec
index bbd46d0..592a4d1 100644
--- a/cockpit-bootloader.spec
+++ b/cockpit-bootloader.spec
@@ -16,17 +16,16 @@
 #
 
 Name: cockpit-bootloader
-Version: 0.3
+Version: 0.4
 Release: 0%{?dist}
 Summary: Cockpit module for editing bootloader settings
 License: LGPL-2.1-or-later
 
 Source:         %{name}-%{version}.tar.xz
-Source3:        vendor.tar.zst
 Source10:       package-lock.json
 Source11:       node_modules.spec.inc
 %include %_sourcedir/node_modules.spec.inc
-ExclusiveArch:  %{rust_arches}
+BuildArch: noarch
 %if ! 0%{?suse_version}
 ExclusiveArch: %{nodejs_arches} noarch
 %endif
@@ -46,35 +45,20 @@ BuildRequires: libappstream-glib-devel
 %endif
 BuildRequires: local-npm-registry
 BuildRequires: cockpit-devel >= 337
-BuildRequires: cargo >= 1.74.0
-BuildRequires: cargo-packaging
-BuildRequires: sqlite3
 
 Requires: cockpit-bridge
+Requires: bootkitd >= 0.2.0
 
 %description
 Cockpit module for editing bootloader settings
 
 %prep
-%autosetup -a3
+%setup -q -n %{name}-%{version}
 rm -rf node_modules
 rm -f package-lock.json
 local-npm-registry %{_sourcedir} install --include=dev --ignore-scripts
 
 %build
-
-# bootkitd build
-cd bootkit-service
-mkdir -p tmp
-touch tmp/bootkit.db
-sqlite3 tmp/bootkit.db < db/grub2.sql
-sqlite3 tmp/bootkit.db < db/selected_snapshot.sql
-export DATABASE_URL=sqlite://`pwd`/tmp/bootkit.db
-%{cargo_build}
-rm tmp/bootkit.db
-cd ..
-
-# cockpit-bootloader build
 mkdir -p pkg
 cp -r %{_datadir}/cockpit/devel/lib pkg/lib
 # Bug in how cockpit devel is built
@@ -82,18 +66,6 @@ sed -i 's/import glob from "glob"/import { glob } from "glob"/' pkg/lib/cockpit-
 NODE_ENV=production npm run build
 
 %install
-
-# bootkitd install
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_prefix}/share/dbus-1/system.d
-install -m 0755 ./target/release/bootkit %{buildroot}%{_sbindir}/bootkitd
-install -m 0644 ./bootkit-service/dbus/bootkitd.service %{buildroot}%{_unitdir}/bootkitd.service
-install -m 0644 ./bootkit-service/dbus/org.opensuse.bootkit.conf %{buildroot}%{_prefix}/share/dbus-1/system.d/org.opensuse.bootkit.conf
-mkdir -p %{buildroot}/var/lib/bootkit
-touch %{buildroot}/var/lib/bootkit/bootkit.db
-
-# cockpit-bootloader install
 PREFIX=/usr DESTDIR=%{buildroot} make install
 
 # drop source maps, they are large and just for debugging
@@ -105,25 +77,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 # this can't be meaningfully tested during package build; tests happen through
 # FMF (see plans/all.fmf) during package gating
 
-%preun
-%systemd_preun bootkitd.service
-
-%postun
-%systemd_postun_with_restart bootkitd.service
-
 %files
 %doc README.md
 %license LICENSE dist/index.js.LEGAL.txt
 %{_datadir}/cockpit
 %{_datadir}/metainfo/*
 
-# bootkitd files
-%dir %{_prefix}/share/dbus-1
-%dir %{_prefix}/share/dbus-1/system.d
-%dir /var/lib/bootkit
-%ghost /var/lib/bootkit/bootkit.db
-%{_sbindir}/bootkitd
-%{_unitdir}/bootkitd.service
-%{_prefix}/share/dbus-1/system.d/org.opensuse.bootkit.conf
-
 %changelog
diff --git a/vendor.tar.zst b/vendor.tar.zst
deleted file mode 100644
index 2908bcb..0000000
--- a/vendor.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:818b40a1d96b0bab805d8f78a87b0229aba6c4cc5195776ccc76ba9d62d3e1d0
-size 28839419
-- 
2.51.1