From df6b54bd86fbc1f9442301a68f2d4f47629bfc99a9f62a3cad702c3906069c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 9 Aug 2024 23:16:24 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main jeos-firstboot revision
 adfde6106111054d2b450e31418d9cad

---
 _servicedata                 |  2 +-
 jeos-firstboot-1.4.3.obscpio |  3 ---
 jeos-firstboot-1.5.0.obscpio |  3 +++
 jeos-firstboot.changes       | 13 +++++++++++++
 jeos-firstboot.obsinfo       |  6 +++---
 jeos-firstboot.spec          |  8 ++++----
 6 files changed, 24 insertions(+), 11 deletions(-)
 delete mode 100644 jeos-firstboot-1.4.3.obscpio
 create mode 100644 jeos-firstboot-1.5.0.obscpio

diff --git a/_servicedata b/_servicedata
index 22db303..c38a21f 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/jeos-firstboot.git</param>
-              <param name="changesrevision">10a8d1780796cd547c8fc71067e1565977ce6050</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">4b389a76e694b83736efc727030aaac5fd283a8c</param></service></servicedata>
\ No newline at end of file
diff --git a/jeos-firstboot-1.4.3.obscpio b/jeos-firstboot-1.4.3.obscpio
deleted file mode 100644
index 4ea7a90..0000000
--- a/jeos-firstboot-1.4.3.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acc6cc3143f23903692bcad032927d31f00c125172c9198cfb157efcf1f05f9a
-size 48138
diff --git a/jeos-firstboot-1.5.0.obscpio b/jeos-firstboot-1.5.0.obscpio
new file mode 100644
index 0000000..225008e
--- /dev/null
+++ b/jeos-firstboot-1.5.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e873e760737c60a988eb097736b81f978efa77e892c1255913423291a96942b
+size 55819
diff --git a/jeos-firstboot.changes b/jeos-firstboot.changes
index ad12c82..f58ba9b 100644
--- a/jeos-firstboot.changes
+++ b/jeos-firstboot.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Aug 07 15:04:27 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.5.0:
+  * Add module for TOTP setup (jsc#CPT-84)
+  * Add module for user creation
+  * Set LC_COLLATE=C.UTF-8
+  * Document module API in README.md
+  * Let modules specify title, description and priority
+  * jeos-firstboot-functions: Simplify _find_modules
+  * Use tabs for indentation everywhere
+  * Drop stale README file
+
 -------------------------------------------------------------------
 Fri May 24 13:08:13 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/jeos-firstboot.obsinfo b/jeos-firstboot.obsinfo
index ec21485..5dc361f 100644
--- a/jeos-firstboot.obsinfo
+++ b/jeos-firstboot.obsinfo
@@ -1,4 +1,4 @@
 name: jeos-firstboot
-version: 1.4.3
-mtime: 1716555925
-commit: 10a8d1780796cd547c8fc71067e1565977ce6050
+version: 1.5.0
+mtime: 1723042914
+commit: 4b389a76e694b83736efc727030aaac5fd283a8c
diff --git a/jeos-firstboot.spec b/jeos-firstboot.spec
index 8b5469d..24677ee 100644
--- a/jeos-firstboot.spec
+++ b/jeos-firstboot.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           jeos-firstboot
-Version:        1.4.3
+Version:        1.5.0
 Release:        0
 Summary:        Simple text based JeOS first boot wizard
 License:        MIT
@@ -39,6 +39,7 @@ Requires:       timezone
 %if 0%{?suse_version} >= 1550
 Requires:       ssh-pairing
 %endif
+Requires:       ((/usr/bin/qrencode and /usr/bin/oathtool) if pam_oath)
 Requires:       (/usr/bin/nmtui if NetworkManager)
 BuildArch:      noarch
 %{?systemd_requires}
@@ -83,7 +84,7 @@ rm %{buildroot}%{_datadir}/jeos-firstboot/modules/raspberrywifi
 %service_add_post jeos-firstboot.service
 
 %files
-%doc README
+%doc README.md
 %license LICENSE
 %{_unitdir}/jeos-firstboot.service
 %{_unitdir}/jeos-firstboot-snapshot.service
@@ -95,8 +96,7 @@ rm %{buildroot}%{_datadir}/jeos-firstboot/modules/raspberrywifi
 %dir %{_datadir}/jeos-firstboot/modules/network-modules/
 %{_datadir}/jeos-firstboot/modules/network-modules/NetworkManager
 %{_datadir}/jeos-firstboot/modules/network-modules/wicked
-%{_datadir}/jeos-firstboot/modules/ssh_enroll
-%{_datadir}/jeos-firstboot/modules/status_mail
+%{_datadir}/jeos-firstboot/modules/{ssh_enroll,status_mail,otp,user}
 %{_sbindir}/jeos-config
 %{_sbindir}/jeos-firstboot
 %{_sbindir}/jeos-firstboot-snapshot