From bcbf3210a1bcedd54b5d2cf94aefeb16a7ed6c6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 26 Feb 2024 17:18:16 +0000
Subject: [PATCH 01/11] service: rename rubygem-agama to rubygem-agama-yast

---
 service/{agama.gemspec => agama-yast.gemspec}               | 6 +++---
 service/package/gem2rpm.yml                                 | 1 +
 .../{rubygem-agama.changes => rubygem-agama-yast.changes}   | 0
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename service/{agama.gemspec => agama-yast.gemspec} (93%)
 rename service/package/{rubygem-agama.changes => rubygem-agama-yast.changes} (100%)

diff --git a/service/agama.gemspec b/service/agama-yast.gemspec
similarity index 93%
rename from service/agama.gemspec
rename to service/agama-yast.gemspec
index 62dbdba14f..b1d50c280d 100644
--- a/service/agama.gemspec
+++ b/service/agama-yast.gemspec
@@ -21,7 +21,7 @@
 # find current contact information at www.suse.com.
 
 Gem::Specification.new do |spec|
-  spec.name = "agama"
+  spec.name = "agama-yast"
 
   # in a git checkout?
   if File.exist?(File.join(__dir__, "../.git"))
@@ -33,8 +33,8 @@ Gem::Specification.new do |spec|
     spec.version = "99.yupdate"
   end
 
-  spec.summary = "Agama Installer Service"
-  spec.description = "System service for Agama, an experimental YaST-based installer."
+  spec.summary = "YaST integration service for Agama"
+  spec.description = "D-Bus service exposing some YaST features that are useful for Agama."
   spec.author = "YaST Team"
   spec.email = "yast-devel@opensuse.org"
   spec.homepage = "https://github.com/openSUSE/agama"
diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml
index 142916e9d2..fef1bc79db 100644
--- a/service/package/gem2rpm.yml
+++ b/service/package/gem2rpm.yml
@@ -23,6 +23,7 @@
   :preamble: |-
     # Override build.rpm, see also https://github.com/openSUSE/obs-build/blob/master/configs/
     %global rb_build_versions %{rb_default_ruby}
+    Provides:       agama-yast
     BuildRequires:  dbus-1-common
     Requires:       dbus-1-common
     Requires:       suseconnect-ruby-bindings
diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama-yast.changes
similarity index 100%
rename from service/package/rubygem-agama.changes
rename to service/package/rubygem-agama-yast.changes

From 383262780212feeb07e7634b3f68e3d41642bfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 26 Feb 2024 15:19:54 +0000
Subject: [PATCH 02/11] rust: rename agama-dbus-server to agama-server

---
 rust/Cargo.toml                                               | 2 +-
 rust/{agama-dbus-server => agama-server}/Cargo.toml           | 0
 .../share/server-example.yaml                                 | 0
 .../src/agama-dbus-server.rs                                  | 0
 .../src/agama-web-server.rs                                   | 0
 rust/{agama-dbus-server => agama-server}/src/error.rs         | 0
 rust/{agama-dbus-server => agama-server}/src/l10n.rs          | 0
 rust/{agama-dbus-server => agama-server}/src/l10n/helpers.rs  | 0
 rust/{agama-dbus-server => agama-server}/src/l10n/keyboard.rs | 0
 rust/{agama-dbus-server => agama-server}/src/l10n/locale.rs   | 0
 rust/{agama-dbus-server => agama-server}/src/l10n/timezone.rs | 0
 rust/{agama-dbus-server => agama-server}/src/l10n/web.rs      | 0
 rust/{agama-dbus-server => agama-server}/src/lib.rs           | 0
 rust/{agama-dbus-server => agama-server}/src/network.rs       | 0
 .../{agama-dbus-server => agama-server}/src/network/action.rs | 0
 .../src/network/adapter.rs                                    | 0
 rust/{agama-dbus-server => agama-server}/src/network/dbus.rs  | 0
 .../src/network/dbus/interfaces.rs                            | 0
 .../src/network/dbus/interfaces/common.rs                     | 0
 .../src/network/dbus/interfaces/connection_configs.rs         | 0
 .../src/network/dbus/interfaces/connections.rs                | 0
 .../src/network/dbus/interfaces/devices.rs                    | 0
 .../src/network/dbus/interfaces/ip_config.rs                  | 0
 .../src/network/dbus/service.rs                               | 0
 .../src/network/dbus/tree.rs                                  | 0
 rust/{agama-dbus-server => agama-server}/src/network/error.rs | 0
 rust/{agama-dbus-server => agama-server}/src/network/model.rs | 0
 .../src/network/model/builder.rs                              | 0
 rust/{agama-dbus-server => agama-server}/src/network/nm.rs    | 0
 .../src/network/nm/adapter.rs                                 | 0
 .../src/network/nm/client.rs                                  | 0
 .../src/network/nm/dbus.rs                                    | 0
 .../src/network/nm/error.rs                                   | 0
 .../src/network/nm/model.rs                                   | 0
 .../src/network/nm/proxies.rs                                 | 0
 .../{agama-dbus-server => agama-server}/src/network/system.rs | 0
 rust/{agama-dbus-server => agama-server}/src/questions.rs     | 0
 .../src/questions/answers.rs                                  | 0
 rust/{agama-dbus-server => agama-server}/src/web.rs           | 0
 rust/{agama-dbus-server => agama-server}/src/web/auth.rs      | 0
 rust/{agama-dbus-server => agama-server}/src/web/config.rs    | 0
 rust/{agama-dbus-server => agama-server}/src/web/docs.rs      | 0
 rust/{agama-dbus-server => agama-server}/src/web/event.rs     | 0
 rust/{agama-dbus-server => agama-server}/src/web/http.rs      | 0
 rust/{agama-dbus-server => agama-server}/src/web/progress.rs  | 0
 rust/{agama-dbus-server => agama-server}/src/web/service.rs   | 0
 rust/{agama-dbus-server => agama-server}/src/web/state.rs     | 0
 rust/{agama-dbus-server => agama-server}/src/web/ws.rs        | 0
 rust/{agama-dbus-server => agama-server}/tests/common/mod.rs  | 0
 rust/{agama-dbus-server => agama-server}/tests/l10n.rs        | 0
 rust/{agama-dbus-server => agama-server}/tests/network.rs     | 0
 rust/{agama-dbus-server => agama-server}/tests/service.rs     | 0
 rust/package/_service                                         | 4 ++--
 53 files changed, 3 insertions(+), 3 deletions(-)
 rename rust/{agama-dbus-server => agama-server}/Cargo.toml (100%)
 rename rust/{agama-dbus-server => agama-server}/share/server-example.yaml (100%)
 rename rust/{agama-dbus-server => agama-server}/src/agama-dbus-server.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/agama-web-server.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/error.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n/helpers.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n/keyboard.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n/locale.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n/timezone.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/l10n/web.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/lib.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/action.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/adapter.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces/common.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces/connection_configs.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces/connections.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces/devices.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/interfaces/ip_config.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/service.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/dbus/tree.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/error.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/model.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/model/builder.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/adapter.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/client.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/dbus.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/error.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/model.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/nm/proxies.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/network/system.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/questions.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/questions/answers.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/auth.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/config.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/docs.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/event.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/http.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/progress.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/service.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/state.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/src/web/ws.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/tests/common/mod.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/tests/l10n.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/tests/network.rs (100%)
 rename rust/{agama-dbus-server => agama-server}/tests/service.rs (100%)

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 36ab33dc58..6885b0b788 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
   "agama-cli",
-  "agama-dbus-server",
+  "agama-server",
   "agama-derive",
   "agama-lib",
   "agama-locale-data",
diff --git a/rust/agama-dbus-server/Cargo.toml b/rust/agama-server/Cargo.toml
similarity index 100%
rename from rust/agama-dbus-server/Cargo.toml
rename to rust/agama-server/Cargo.toml
diff --git a/rust/agama-dbus-server/share/server-example.yaml b/rust/agama-server/share/server-example.yaml
similarity index 100%
rename from rust/agama-dbus-server/share/server-example.yaml
rename to rust/agama-server/share/server-example.yaml
diff --git a/rust/agama-dbus-server/src/agama-dbus-server.rs b/rust/agama-server/src/agama-dbus-server.rs
similarity index 100%
rename from rust/agama-dbus-server/src/agama-dbus-server.rs
rename to rust/agama-server/src/agama-dbus-server.rs
diff --git a/rust/agama-dbus-server/src/agama-web-server.rs b/rust/agama-server/src/agama-web-server.rs
similarity index 100%
rename from rust/agama-dbus-server/src/agama-web-server.rs
rename to rust/agama-server/src/agama-web-server.rs
diff --git a/rust/agama-dbus-server/src/error.rs b/rust/agama-server/src/error.rs
similarity index 100%
rename from rust/agama-dbus-server/src/error.rs
rename to rust/agama-server/src/error.rs
diff --git a/rust/agama-dbus-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n.rs
rename to rust/agama-server/src/l10n.rs
diff --git a/rust/agama-dbus-server/src/l10n/helpers.rs b/rust/agama-server/src/l10n/helpers.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n/helpers.rs
rename to rust/agama-server/src/l10n/helpers.rs
diff --git a/rust/agama-dbus-server/src/l10n/keyboard.rs b/rust/agama-server/src/l10n/keyboard.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n/keyboard.rs
rename to rust/agama-server/src/l10n/keyboard.rs
diff --git a/rust/agama-dbus-server/src/l10n/locale.rs b/rust/agama-server/src/l10n/locale.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n/locale.rs
rename to rust/agama-server/src/l10n/locale.rs
diff --git a/rust/agama-dbus-server/src/l10n/timezone.rs b/rust/agama-server/src/l10n/timezone.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n/timezone.rs
rename to rust/agama-server/src/l10n/timezone.rs
diff --git a/rust/agama-dbus-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
similarity index 100%
rename from rust/agama-dbus-server/src/l10n/web.rs
rename to rust/agama-server/src/l10n/web.rs
diff --git a/rust/agama-dbus-server/src/lib.rs b/rust/agama-server/src/lib.rs
similarity index 100%
rename from rust/agama-dbus-server/src/lib.rs
rename to rust/agama-server/src/lib.rs
diff --git a/rust/agama-dbus-server/src/network.rs b/rust/agama-server/src/network.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network.rs
rename to rust/agama-server/src/network.rs
diff --git a/rust/agama-dbus-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/action.rs
rename to rust/agama-server/src/network/action.rs
diff --git a/rust/agama-dbus-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/adapter.rs
rename to rust/agama-server/src/network/adapter.rs
diff --git a/rust/agama-dbus-server/src/network/dbus.rs b/rust/agama-server/src/network/dbus.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus.rs
rename to rust/agama-server/src/network/dbus.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces.rs b/rust/agama-server/src/network/dbus/interfaces.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces.rs
rename to rust/agama-server/src/network/dbus/interfaces.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces/common.rs b/rust/agama-server/src/network/dbus/interfaces/common.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces/common.rs
rename to rust/agama-server/src/network/dbus/interfaces/common.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces/connection_configs.rs b/rust/agama-server/src/network/dbus/interfaces/connection_configs.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces/connection_configs.rs
rename to rust/agama-server/src/network/dbus/interfaces/connection_configs.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces/connections.rs b/rust/agama-server/src/network/dbus/interfaces/connections.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces/connections.rs
rename to rust/agama-server/src/network/dbus/interfaces/connections.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces/devices.rs b/rust/agama-server/src/network/dbus/interfaces/devices.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces/devices.rs
rename to rust/agama-server/src/network/dbus/interfaces/devices.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces/ip_config.rs b/rust/agama-server/src/network/dbus/interfaces/ip_config.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/interfaces/ip_config.rs
rename to rust/agama-server/src/network/dbus/interfaces/ip_config.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/service.rs b/rust/agama-server/src/network/dbus/service.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/service.rs
rename to rust/agama-server/src/network/dbus/service.rs
diff --git a/rust/agama-dbus-server/src/network/dbus/tree.rs b/rust/agama-server/src/network/dbus/tree.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/dbus/tree.rs
rename to rust/agama-server/src/network/dbus/tree.rs
diff --git a/rust/agama-dbus-server/src/network/error.rs b/rust/agama-server/src/network/error.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/error.rs
rename to rust/agama-server/src/network/error.rs
diff --git a/rust/agama-dbus-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/model.rs
rename to rust/agama-server/src/network/model.rs
diff --git a/rust/agama-dbus-server/src/network/model/builder.rs b/rust/agama-server/src/network/model/builder.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/model/builder.rs
rename to rust/agama-server/src/network/model/builder.rs
diff --git a/rust/agama-dbus-server/src/network/nm.rs b/rust/agama-server/src/network/nm.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm.rs
rename to rust/agama-server/src/network/nm.rs
diff --git a/rust/agama-dbus-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/adapter.rs
rename to rust/agama-server/src/network/nm/adapter.rs
diff --git a/rust/agama-dbus-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/client.rs
rename to rust/agama-server/src/network/nm/client.rs
diff --git a/rust/agama-dbus-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/dbus.rs
rename to rust/agama-server/src/network/nm/dbus.rs
diff --git a/rust/agama-dbus-server/src/network/nm/error.rs b/rust/agama-server/src/network/nm/error.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/error.rs
rename to rust/agama-server/src/network/nm/error.rs
diff --git a/rust/agama-dbus-server/src/network/nm/model.rs b/rust/agama-server/src/network/nm/model.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/model.rs
rename to rust/agama-server/src/network/nm/model.rs
diff --git a/rust/agama-dbus-server/src/network/nm/proxies.rs b/rust/agama-server/src/network/nm/proxies.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/nm/proxies.rs
rename to rust/agama-server/src/network/nm/proxies.rs
diff --git a/rust/agama-dbus-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
similarity index 100%
rename from rust/agama-dbus-server/src/network/system.rs
rename to rust/agama-server/src/network/system.rs
diff --git a/rust/agama-dbus-server/src/questions.rs b/rust/agama-server/src/questions.rs
similarity index 100%
rename from rust/agama-dbus-server/src/questions.rs
rename to rust/agama-server/src/questions.rs
diff --git a/rust/agama-dbus-server/src/questions/answers.rs b/rust/agama-server/src/questions/answers.rs
similarity index 100%
rename from rust/agama-dbus-server/src/questions/answers.rs
rename to rust/agama-server/src/questions/answers.rs
diff --git a/rust/agama-dbus-server/src/web.rs b/rust/agama-server/src/web.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web.rs
rename to rust/agama-server/src/web.rs
diff --git a/rust/agama-dbus-server/src/web/auth.rs b/rust/agama-server/src/web/auth.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/auth.rs
rename to rust/agama-server/src/web/auth.rs
diff --git a/rust/agama-dbus-server/src/web/config.rs b/rust/agama-server/src/web/config.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/config.rs
rename to rust/agama-server/src/web/config.rs
diff --git a/rust/agama-dbus-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/docs.rs
rename to rust/agama-server/src/web/docs.rs
diff --git a/rust/agama-dbus-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/event.rs
rename to rust/agama-server/src/web/event.rs
diff --git a/rust/agama-dbus-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/http.rs
rename to rust/agama-server/src/web/http.rs
diff --git a/rust/agama-dbus-server/src/web/progress.rs b/rust/agama-server/src/web/progress.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/progress.rs
rename to rust/agama-server/src/web/progress.rs
diff --git a/rust/agama-dbus-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/service.rs
rename to rust/agama-server/src/web/service.rs
diff --git a/rust/agama-dbus-server/src/web/state.rs b/rust/agama-server/src/web/state.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/state.rs
rename to rust/agama-server/src/web/state.rs
diff --git a/rust/agama-dbus-server/src/web/ws.rs b/rust/agama-server/src/web/ws.rs
similarity index 100%
rename from rust/agama-dbus-server/src/web/ws.rs
rename to rust/agama-server/src/web/ws.rs
diff --git a/rust/agama-dbus-server/tests/common/mod.rs b/rust/agama-server/tests/common/mod.rs
similarity index 100%
rename from rust/agama-dbus-server/tests/common/mod.rs
rename to rust/agama-server/tests/common/mod.rs
diff --git a/rust/agama-dbus-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
similarity index 100%
rename from rust/agama-dbus-server/tests/l10n.rs
rename to rust/agama-server/tests/l10n.rs
diff --git a/rust/agama-dbus-server/tests/network.rs b/rust/agama-server/tests/network.rs
similarity index 100%
rename from rust/agama-dbus-server/tests/network.rs
rename to rust/agama-server/tests/network.rs
diff --git a/rust/agama-dbus-server/tests/service.rs b/rust/agama-server/tests/service.rs
similarity index 100%
rename from rust/agama-dbus-server/tests/service.rs
rename to rust/agama-server/tests/service.rs
diff --git a/rust/package/_service b/rust/package/_service
index 74597e457b..04b7d36141 100644
--- a/rust/package/_service
+++ b/rust/package/_service
@@ -7,8 +7,8 @@
     <param name="revision">master</param>
     <param name="subdir">rust</param>
     <param name="without-version">enable</param>
-    <param name="extract">package/agama-cli.changes</param>
-    <param name="extract">package/agama-cli.spec</param>
+    <param name="extract">package/agama.changes</param>
+    <param name="extract">package/agama.spec</param>
   </service>
   <service name="cargo_vendor" mode="manual">
     <param name="srcdir">agama/rust</param>

From 14ed20265920013a402ffc2cbb553fe603f65e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 26 Feb 2024 16:06:23 +0000
Subject: [PATCH 03/11] rust: reorganize the packaging

---
 .../{agama-cli.changes => agama.changes}      |  0
 rust/package/{agama-cli.spec => agama.spec}   | 51 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)
 rename rust/package/{agama-cli.changes => agama.changes} (100%)
 rename rust/package/{agama-cli.spec => agama.spec} (80%)

diff --git a/rust/package/agama-cli.changes b/rust/package/agama.changes
similarity index 100%
rename from rust/package/agama-cli.changes
rename to rust/package/agama.changes
diff --git a/rust/package/agama-cli.spec b/rust/package/agama.spec
similarity index 80%
rename from rust/package/agama-cli.spec
rename to rust/package/agama.spec
index b180f26aa7..418b94e034 100644
--- a/rust/package/agama-cli.spec
+++ b/rust/package/agama.spec
@@ -15,11 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           agama-cli
+Name:           agama
 #               This will be set by osc services, that will run after this.
 Version:        0
 Release:        0
-Summary:        Agama command line interface
+Summary:        Agama Installer
 #               If you know the license, put it's SPDX string here.
 #               Alternately, you can use cargo lock2rpmprovides to help generate this.
 License:        GPL-2.0-only
@@ -30,49 +30,42 @@ BuildRequires:  cargo-packaging
 BuildRequires:  pkgconfig(openssl)
 # used in tests for dbus service
 BuildRequires:  python-langtable-data
-BuildRequires:  timezone
 BuildRequires:  dbus-1-common
+Requires:       dbus-1-common
 # required by agama-dbus-server integration tests
 BuildRequires:  dbus-1-daemon
 BuildRequires:  clang-devel
 BuildRequires:  pkgconfig(pam)
+# required by autoinstallation
 Requires:       jsonnet
 Requires:       lshw
 # required by "agama logs store"
 Requires:       bzip2
 Requires:       tar
 # required for translating the keyboards descriptions
+BuildRequires:  xkeyboard-config-lang
 Requires:       xkeyboard-config-lang
 # required for getting the list of timezones
 Requires:       timezone
+BuildRequires:  timezone
+# dependency on the YaST part of Agama
+Requires:       agama-yast
 
 %description
-Command line program to interact with the agama service.
-
-%package -n agama-dbus-server
-#               This will be set by osc services, that will run after this.
-Version:        0
-Release:        0
-Summary:        Agama Rust D-Bus service
-License:        GPL-2.0-only
-Url:            https://github.com/opensuse/agama
-Requires:       python-langtable-data
-Requires:       dbus-1-common
+Agama is a service-based Linux installer. It is composed of an HTTP-based API,
+a web user interface, a command-line interface and a D-Bus service which exposes
+part of the YaST libraries.
 
-%description -n agama-dbus-server
-D-Bus service for agama project. It provides localization, networking and questions services.
-
-%package -n agama-web-server
+%package -n agama-cli
 #               This will be set by osc services, that will run after this.
 Version:        0
 Release:        0
-Summary:        Agama web server
+Summary:        Agama command-line interface
 License:        GPL-2.0-only
 Url:            https://github.com/opensuse/agama
-Requires:       agama-dbus-server
 
-%description -n agama-web-server
-Agama project web server. It provides a web-based API to Agama.
+%description -n agama-cli
+Command line program to interact with the Agama installer.
 
 %prep
 %autosetup -a1 -n agama
@@ -95,23 +88,23 @@ install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services
 
 
 %check
+PATH=$PWD/share/bin:$PATH
 %ifarch aarch64
 /usr/bin/cargo auditable test -j1 --offline --no-fail-fast
 %else
+echo $PATH
 %{cargo_test}
 %endif
 
 %files
-%{_bindir}/agama
-%dir %{_datadir}/agama-cli
-%{_datadir}/agama-cli/profile.schema.json
-
-%files -n agama-dbus-server
 %{_bindir}/agama-dbus-server
+%{_bindir}/agama-web-server
 %{_datadir}/dbus-1/agama-services
 %{_pam_vendordir}/agama
 
-%files -n agama-web-server
-%{_bindir}/agama-web-server
+%files -n agama-cli
+%{_bindir}/agama
+%dir %{_datadir}/agama-cli
+%{_datadir}/agama-cli/profile.schema.json
 
 %changelog

From 10def5c139534a3d9f8981d22d7eec5c0fe94619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 11:33:07 +0000
Subject: [PATCH 04/11] rust: re-enable LocalesDatabase tests

---
 rust/agama-server/src/l10n/locale.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rust/agama-server/src/l10n/locale.rs b/rust/agama-server/src/l10n/locale.rs
index 630c844144..65d76ec1e4 100644
--- a/rust/agama-server/src/l10n/locale.rs
+++ b/rust/agama-server/src/l10n/locale.rs
@@ -117,7 +117,6 @@ mod tests {
     use super::LocalesDatabase;
     use agama_locale_data::LocaleCode;
 
-    #[ignore]
     #[test]
     fn test_read_locales() {
         let mut db = LocalesDatabase::new();
@@ -129,7 +128,6 @@ mod tests {
         assert_eq!(&found.territory, "Spanien");
     }
 
-    #[ignore]
     #[test]
     fn test_locale_exists() {
         let mut db = LocalesDatabase::new();

From 6480258386864a30736326b43c16a116d4f7317c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 11:38:33 +0000
Subject: [PATCH 05/11] rust: avoid warning messages when compiling mod.rs

* See https://users.rust-lang.org/t/invalid-dead-code-warning-for-submodule-in-integration-test/80259.
---
 rust/agama-server/tests/l10n.rs    | 2 +-
 rust/agama-server/tests/network.rs | 2 +-
 rust/agama-server/tests/service.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
index 6ad7e352a0..f2d0291c29 100644
--- a/rust/agama-server/tests/l10n.rs
+++ b/rust/agama-server/tests/l10n.rs
@@ -1,4 +1,4 @@
-mod common;
+pub mod common;
 
 use agama_dbus_server::l10n::web::l10n_service;
 use axum::{
diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs
index 2261746325..ed4b0037b2 100644
--- a/rust/agama-server/tests/network.rs
+++ b/rust/agama-server/tests/network.rs
@@ -1,4 +1,4 @@
-mod common;
+pub mod common;
 
 use self::common::{async_retry, DBusServer};
 use agama_dbus_server::network::{
diff --git a/rust/agama-server/tests/service.rs b/rust/agama-server/tests/service.rs
index aac1b2922b..6179484be8 100644
--- a/rust/agama-server/tests/service.rs
+++ b/rust/agama-server/tests/service.rs
@@ -1,4 +1,4 @@
-mod common;
+pub mod common;
 
 use agama_dbus_server::{
     service,

From 325bc6fc7a93d59290d51d86bd6ff2aebad03fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 14:03:38 +0000
Subject: [PATCH 06/11] Update Copyright headers

---
 rust/package/agama.spec    | 4 ++--
 service/agama-yast.gemspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/package/agama.spec b/rust/package/agama.spec
index 418b94e034..926ab05b07 100644
--- a/rust/package/agama.spec
+++ b/rust/package/agama.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package agama-cli
+# spec file for package agama
 #
-# Copyright (c) 2023 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023-2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/service/agama-yast.gemspec b/service/agama-yast.gemspec
index b1d50c280d..d93dfdd3fd 100644
--- a/service/agama-yast.gemspec
+++ b/service/agama-yast.gemspec
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) [2022] SUSE LLC
+# Copyright (c) 2022-2024 SUSE LLC
 #
 # All Rights Reserved.
 #

From ac16e4ecb5c396981c05f41ae65cebb31be1a6d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 15:43:44 +0000
Subject: [PATCH 07/11] Adapt GitHub Actions to the new package names

---
 .github/workflows/obs-release.yml         | 2 +-
 .github/workflows/obs-service-shared.yml  | 4 ++--
 .github/workflows/obs-staging-rust.yml    | 2 +-
 .github/workflows/obs-staging-service.yml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/obs-release.yml b/.github/workflows/obs-release.yml
index c31034c5fd..77d1f0049a 100644
--- a/.github/workflows/obs-release.yml
+++ b/.github/workflows/obs-release.yml
@@ -20,7 +20,7 @@ jobs:
     with:
       install_packages: obs-service-cargo_audit obs-service-cargo_vendor
       project_name: systemsmanagement:Agama:Devel
-      package_name: agama-cli
+      package_name: agama
 
   update_web:
     uses: ./.github/workflows/obs-staging-shared.yml
diff --git a/.github/workflows/obs-service-shared.yml b/.github/workflows/obs-service-shared.yml
index ab99479bc4..a7f4871fd0 100644
--- a/.github/workflows/obs-service-shared.yml
+++ b/.github/workflows/obs-service-shared.yml
@@ -62,7 +62,7 @@ jobs:
           OBS_USER:     ${{ secrets.OBS_USER }}
           OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }}
 
-      - name: Commit the rubygem-agama package to ${{ inputs.project_name }}
+      - name: Commit the rubygem-agama-yast package to ${{ inputs.project_name }}
         run: rake osc:commit
         working-directory: ./service
         env:
@@ -71,7 +71,7 @@ jobs:
           SKIP_OSC_BUILD: 1
           OBS_PROJECT: ${{ inputs.project_name }}
 
-      - name: Submit the rubygem-agama package
+      - name: Submit the rubygem-agama-yast package
         # only when a tag has been pushed
         if: ${{ github.ref_type == 'tag' }}
         # the package has been comitted in the previous step, just submit it
diff --git a/.github/workflows/obs-staging-rust.yml b/.github/workflows/obs-staging-rust.yml
index b83f6759f7..0e804b3c2f 100644
--- a/.github/workflows/obs-staging-rust.yml
+++ b/.github/workflows/obs-staging-rust.yml
@@ -17,4 +17,4 @@ jobs:
     with:
       install_packages: obs-service-cargo_audit obs-service-cargo_vendor
       project_name: systemsmanagement:Agama:Staging
-      package_name: agama-cli
+      package_name: agama
diff --git a/.github/workflows/obs-staging-service.yml b/.github/workflows/obs-staging-service.yml
index 5d3cb47bf5..342f2e38f0 100644
--- a/.github/workflows/obs-staging-service.yml
+++ b/.github/workflows/obs-staging-service.yml
@@ -1,4 +1,4 @@
-name: Submit rubygem-agama
+name: Submit rubygem-agama-yast
 
 on:
   # runs on pushes targeting the default branch

From 7aff6f282d312fb21edd5c3e65a36c0473fd7242 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 15:46:09 +0000
Subject: [PATCH 08/11] Update documentation with new package names

---
 PACKAGING.md      | 20 +++++++++++---------
 README.md         | 12 ++++++------
 setup-services.sh |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/PACKAGING.md b/PACKAGING.md
index 58cee4ee62..60314c10ec 100644
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -23,10 +23,11 @@ The Agama packages are available in two OBS projects:
 You can find more details the automatic OBS synchronization in the
 [obs_integration.md](doc/obs_integration.md) file.
 
-The process to build each package is slightly different depending on the technology we are using.
-While the Ruby-based one (`rubygem-agama`) is built as any other YaST package, the web UI
-(`cockpit-agama`) and the CLI (`agama-cli`) rely on [OBS source
-services](https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.source_service.html).
+The process to build each package is slightly different depending on the
+technology we are using. While the Ruby-based one (`rubygem-agama-yast`) is
+built as any other YaST package, Agama server (`agama`), the CLI (`agama-cli`),
+and the web UI (`cockpit-agama`) rely on
+[OBS source services](https://openbuildservice.org/help/manuals/obs-user-guide/cha.obs.source_service.html).
 
 ## Versioning Policy
 
@@ -71,8 +72,8 @@ for manual update.
 ### Service
 
 You can check the current package in
-[systemsmanagement:Agama:Staging/rubygem-agama](
-https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/rubygem-agama).
+[systemsmanagement:Agama:Staging/rubygem-agama-yast](
+https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/rubygem-agama-yast).
 
 Use `rake` to update the package in OBS as you would do with any other YaST package:
 
@@ -108,10 +109,11 @@ respect such a tag. (e.g. `2.1+42`).
 You can read more about the overall approach of this package in the following article: [Git work
 flows in the upcoming 2.7 release](https://openbuildservice.org/2016/04/08/new_git_in_27/).
 
-### Command-line Interface
+### Server and command-line Interface
 
-The current package is [systemsmanagement:Agama:Staging/agama-cli](
-https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-cli).
+The current package is [systemsmanagement:Agama:Staging/agama](
+https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama),
+which includes `agama` and `agama-cli` as a subpackage.
 
 To manually update the package in the build service, run the following commands:
 
diff --git a/README.md b/README.md
index 970385403e..6fd9ba799c 100644
--- a/README.md
+++ b/README.md
@@ -18,14 +18,14 @@
 
 **[OBS systemsmanagement:Agama:Staging](https://build.opensuse.org/project/show/systemsmanagement:Agama:Staging)**
 
-[![Submit agama-cli](https://github.com/openSUSE/agama/actions/workflows/obs-staging-rust.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-rust.yml)
+[![Submit agama](https://github.com/openSUSE/agama/actions/workflows/obs-staging-rust.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-rust.yml)
 [![Submit cockpit-agama](https://github.com/openSUSE/agama/actions/workflows/obs-staging-web.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-web.yml)
-[![Submit rubygem-agama](https://github.com/openSUSE/agama/actions/workflows/obs-staging-service.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-service.yml)
+[![Submit rubygem-agama-yast](https://github.com/openSUSE/agama/actions/workflows/obs-staging-service.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-service.yml)
 [![Submit cockpit-agama-playwright](https://github.com/openSUSE/agama/actions/workflows/obs-staging-playwright.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-staging-playwright.yml)
 
-[![OBS Staging/agama-cli](https://img.shields.io/obs/systemsmanagement:Agama:Staging/agama-cli/openSUSE_Tumbleweed/x86_64?label=Package%20agama-cli)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-cli)
+[![OBS Staging/agama](https://img.shields.io/obs/systemsmanagement:Agama:Staging/agama/openSUSE_Tumbleweed/x86_64?label=Package%20agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama)
 [![OBS Staging/cockpit-agama](https://img.shields.io/obs/systemsmanagement:Agama:Staging/cockpit-agama/openSUSE_Tumbleweed/x86_64?label=Package%20cockpit-agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/cockpit-agama)
-[![OBS Staging/rubygem-agama](https://img.shields.io/obs/systemsmanagement:Agama:Staging/rubygem-agama/openSUSE_Tumbleweed/x86_64?label=Package%20rubygem-agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/rubygem-agama)
+[![OBS Staging/rubygem-agama-yast](https://img.shields.io/obs/systemsmanagement:Agama:Staging/rubygem-agama-yast/openSUSE_Tumbleweed/x86_64?label=Package%20rubygem-agama-yast)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/rubygem-agama-yast)
 [![OBS Staging/agama-products-opensuse](https://img.shields.io/obs/systemsmanagement%3AAgama%3AStaging/agama-products-opensuse/openSUSE_Tumbleweed/x86_64?label=Package%20agama-products-opensuse)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-products-opensuse)
 [![OBS Staging/cockpit-agama-playwright](https://img.shields.io/obs/systemsmanagement:Agama:Staging/cockpit-agama-playwright/openSUSE_Tumbleweed/x86_64?label=Package%20cockpit-agama-playwright)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/cockpit-agama-playwright)
 [![OBS Staging/agama-live](https://img.shields.io/obs/systemsmanagement:Agama:Staging/agama-live:openSUSE/images/x86_64?label=Live%20ISO)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama-live)
@@ -35,9 +35,9 @@
 ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/openSUSE/agama?label=Version&sort=semver)
 [![Release](https://github.com/openSUSE/agama/actions/workflows/obs-release.yml/badge.svg)](https://github.com/openSUSE/agama/actions/workflows/obs-release.yml)
 
-[![OBS Devel/agama-cli](https://img.shields.io/obs/systemsmanagement:Agama:Devel/agama-cli/openSUSE_Tumbleweed/x86_64?label=Package%20agama-cli)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/agama-cli)
+[![OBS Devel/agama](https://img.shields.io/obs/systemsmanagement:Agama:Devel/agama/openSUSE_Tumbleweed/x86_64?label=Package%20agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/agama)
 [![OBS Devel/cockpit-agama](https://img.shields.io/obs/systemsmanagement:Agama:Devel/cockpit-agama/openSUSE_Tumbleweed/x86_64?label=Package%20cockpit-agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/cockpit-agama)
-[![OBS Devel/rubygem-agama](https://img.shields.io/obs/systemsmanagement:Agama:Devel/rubygem-agama/openSUSE_Tumbleweed/x86_64?label=Package%20rubygem-agama)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/rubygem-agama)
+[![OBS Devel/rubygem-agama-yast](https://img.shields.io/obs/systemsmanagement:Agama:Devel/rubygem-agama-yast/openSUSE_Tumbleweed/x86_64?label=Package%20rubygem-agama-yast)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/rubygem-agama-yast)
 [![OBS Devel/agama-live](https://img.shields.io/obs/systemsmanagement:Agama:Devel/agama-live:openSUSE/images/x86_64?label=Live%20ISO)](https://build.opensuse.org/package/show/systemsmanagement:Agama:Devel/agama-live)
 
 # Agama: A Service-based Linux Installer
diff --git a/setup-services.sh b/setup-services.sh
index 4f54260ce4..ee647418d1 100755
--- a/setup-services.sh
+++ b/setup-services.sh
@@ -121,7 +121,7 @@ fi
 # Only install cargo if it is not available (avoid conflicts with rustup)
 which cargo || $SUDO zypper --non-interactive install cargo
 
-# Packages required by Rust code (see ./rust/package/agama-cli.spec)
+# Packages required by Rust code (see ./rust/package/agama.spec)
 $SUDO zypper --non-interactive install \
   bzip2 \
   clang-devel \

From f15e694f2a9dec52aa0c23096d7334b62f9d11c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 16:03:18 +0000
Subject: [PATCH 09/11] Update changes files

---
 rust/package/agama.changes                 | 8 ++++++++
 service/package/rubygem-agama-yast.changes | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index ef6dccebab..656cd074eb 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 27 15:55:28 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Reorganize RPM packages (gh#openSUSE/agama#1056):
+  * agama is now the main package and it contains agama-dbus-server
+    and agama-web-server.
+  * agama-cli is a subpackage.
+
 -------------------------------------------------------------------
 Wed Feb  7 11:49:02 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
index 8c07ea0b36..5f51032451 100644
--- a/service/package/rubygem-agama-yast.changes
+++ b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 27 15:53:46 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Rename the gem to agama-yast and the package to
+  rubygem-agama-yast (gh#openSUSE/agama#1056).
+
 -------------------------------------------------------------------
 Tue Feb 20 13:15:15 UTC 2024 - José Iván López González <jlopez@suse.com>
 

From 71c12520462492cebcc42d227938cad95b6143f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 27 Feb 2024 16:05:11 +0000
Subject: [PATCH 10/11] Add a conflict with the agama-dbus-server package

---
 rust/package/agama.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rust/package/agama.spec b/rust/package/agama.spec
index 926ab05b07..51edf53679 100644
--- a/rust/package/agama.spec
+++ b/rust/package/agama.spec
@@ -26,6 +26,7 @@ License:        GPL-2.0-only
 Url:            https://github.com/opensuse/agama
 Source0:        agama.tar
 Source1:        vendor.tar.zst
+
 BuildRequires:  cargo-packaging
 BuildRequires:  pkgconfig(openssl)
 # used in tests for dbus service
@@ -51,6 +52,9 @@ BuildRequires:  timezone
 # dependency on the YaST part of Agama
 Requires:       agama-yast
 
+# conflicts with the old packages
+Conflicts:      agama-dbus-server
+
 %description
 Agama is a service-based Linux installer. It is composed of an HTTP-based API,
 a web user interface, a command-line interface and a D-Bus service which exposes

From 3bbfbb24249a9aa4923bae5f781be6c0a09d900f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 28 Feb 2024 16:45:45 +0000
Subject: [PATCH 11/11] Update from code review

Co-authored-by: Josef Reidinger <jreidinger@suse.cz>
---
 PACKAGING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PACKAGING.md b/PACKAGING.md
index 60314c10ec..08fb248b25 100644
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -109,7 +109,7 @@ respect such a tag. (e.g. `2.1+42`).
 You can read more about the overall approach of this package in the following article: [Git work
 flows in the upcoming 2.7 release](https://openbuildservice.org/2016/04/08/new_git_in_27/).
 
-### Server and command-line Interface
+### Server and Command-line Interface
 
 The current package is [systemsmanagement:Agama:Staging/agama](
 https://build.opensuse.org/package/show/systemsmanagement:Agama:Staging/agama),