- Build with glade

- Added missing msvsphere.conf

SOURCES/0006-Add-MSVSphere-product-config.patch

@@ -1,26 +1,55 @@
-From 64f8019f5383344dc0abdb5b84f4049b9cb531f1 Mon Sep 17 00:00:00 2001
-From: Eugene Zamriy <eugene@zamriy.info>
-Date: Fri, 14 Apr 2023 14:59:53 +0300
-Subject: [PATCH 06/15] Add MSVSphere product config
+From 9fb4b8b7e4e6a995da947d93718eb945b8f1bc30 Mon Sep 17 00:00:00 2001
+From: tigro <tigro@msvsphere-os.ru>
+Date: Tue, 24 Dec 2024 14:45:34 +0300
+Subject: [PATCH] Add MSVSphere product config
 
 ---
- data/product.d/msvsphere.conf | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
- create mode 100644 data/product.d/msvsphere.conf
+ data/profile.d/Makefile.am    |  1 +
+ data/profile.d/Makefile.in    |  1 +
+ data/profile.d/msvsphere.conf | 24 ++++++++++++++++++++++++
+ 3 files changed, 26 insertions(+)
+ create mode 100644 data/profile.d/msvsphere.conf
 
-diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf
+diff --git a/data/profile.d/Makefile.am b/data/profile.d/Makefile.am
+index 2f1dbd9..643a236 100644
+--- a/data/profile.d/Makefile.am
++++ b/data/profile.d/Makefile.am
+@@ -30,6 +30,7 @@ dist_config_DATA    = \
+ 	fedora-silverblue.conf \
+ 	fedora-workstation.conf \
+ 	fedora.conf \
++	msvsphere.conf \
+ 	ovirt.conf \
+ 	rhel.conf \
+ 	rhvh.conf \
+diff --git a/data/profile.d/Makefile.in b/data/profile.d/Makefile.in
+index d9911fd..e891c84 100644
+--- a/data/profile.d/Makefile.in
++++ b/data/profile.d/Makefile.in
+@@ -328,6 +328,7 @@ dist_config_DATA = \
+ 	fedora-silverblue.conf \
+ 	fedora-workstation.conf \
+ 	fedora.conf \
++	msvsphere.conf \
+ 	ovirt.conf \
+ 	rhel.conf \
+ 	rhvh.conf \
+diff --git a/data/profile.d/msvsphere.conf b/data/profile.d/msvsphere.conf
 new file mode 100644
-index 0000000..28d3109
+index 0000000..6f4ac7e
 --- /dev/null
-+++ b/data/product.d/msvsphere.conf
++++ b/data/profile.d/msvsphere.conf
 @@ -0,0 +1,24 @@
 +# Anaconda configuration file for MSVSphere.
 +
-+[Product]
-+product_name = MSVSphere
++[Profile]
++# Define the profile.
++profile_id = msvsphere
++base_profile = rhel
 +
-+[Base Product]
-+product_name = Red Hat Enterprise Linux
++[Profile Detection]
++# Match os-release values.
++os_id = msvsphere
 +
 +[Anaconda]
 +forbidden_modules =
@@ -33,11 +62,8 @@ index 0000000..28d3109
 +enable_closest_mirror = True
 +default_source = CLOSEST_MIRROR
 +
-+[User Interface]
-+help_directory = /usr/share/anaconda/help/rhel
-+
 +[License]
-+eula = /usr/share/sphere-release/EULA
++eula = /usr/share/msvsphere-release/EULA
 -- 
-2.43.5
+2.47.1
 

SPECS/anaconda.spec

@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 40.22.3.12
-Release: 1%{?dist}.inferit.1
+Release: 1%{?dist}.inferit.2
 License: GPL-2.0-or-later
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -32,14 +32,8 @@ Patch1015: 0015-Change-docs-site.patch
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
-%if ! 0%{?rhel}
-%bcond_without glade
-%define blivetguiver 2.4.2-3
-%else
-%bcond_with glade
-%endif
-
 %bcond_without live
+%bcond_without glade
 
 %define dasbusver 1.3
 %define dbusver 1.2.3
@@ -519,6 +513,10 @@ rm -rf \
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Tue Dec 24 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 40.22.3.12-1.inferit.2
+- Build with glade
+- Added missing msvsphere.conf
+
 * Mon Dec 23 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 40.22.3.12-1.inferit.1
 - Build live package