Merge pull request #9435 from mcalmer/prepare51

Prepare packages for SUSE Manager 5.1
uyuni-project · Nov 10, 2024 · 1e6cc42 · 1e6cc42
2 parents ac19845 + be02d39
commit 1e6cc42
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/java/conf/rhn_java.conf b/java/conf/rhn_java.conf
@@ -226,7 +226,7 @@ java.mgr_sync_max_connections = 4
 java.max_changelog_entries = 20
 
 # Determins which product tree variation to use.
-java.product_tree_tag = SUMA5.0
+java.product_tree_tag = SUMA5.1
 
 # If true, login is enabled via Single Sign-On (SSO)
 java.sso = false
@@ -266,4 +266,4 @@ java.reboot_delay = 3
 java.disable_remote_commands_from_ui = false
 
 # Enable the usage of OVAL metadata in CVE auditing
-java.cve_audit.enable_oval_metadata = true
+java.cve_audit.enable_oval_metadata = true
diff --git a/java/spacewalk-java.changes.mc.prepare51 b/java/spacewalk-java.changes.mc.prepare51
@@ -0,0 +1 @@
+- Prepare package for SUSE Multi-Linux Manager 5.1
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
@@ -550,6 +550,8 @@ install -m 644 conf/rhn_java_sso.conf %{buildroot}%{_datadir}/rhn/config-default
 # Adjust product tree tag
 %if 0%{?is_opensuse}
 sed -i -e 's/^java.product_tree_tag =.*$/java.product_tree_tag = Uyuni/' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_java.conf
+%else
+sed -i -e 's/^java.product_tree_tag =.*$/java.product_tree_tag = Beta/' $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_java.conf
 %endif
 # Adjust languages
 sed -i -e '/# NOTE: for the RPMs this is defined at the SPEC!/d' %{buildroot}%{_datadir}/rhn/config-defaults/rhn_java.conf

diff --git a/java/tito.props b/java/tito.props
@@ -5,5 +5,5 @@ salt-netapi-client=0.21
 salt-netapi-client=0.21
 
 [conf/rhn_java.conf]
-java.min_schema_version=5.0.8
-java.min_report_schema_version=5.0.5
+java.min_schema_version=5.1.2
+java.min_report_schema_version=5.1.2
diff --git a/python/spacewalk/spacewalk-backend.changes.mc.prepare51 b/python/spacewalk/spacewalk-backend.changes.mc.prepare51
@@ -0,0 +1 @@
+- require 5.1 database schema
diff --git a/python/spacewalk/tito.props b/python/spacewalk/tito.props
@@ -1,2 +1,2 @@
 [rhn-conf/rhn_server_xmlrpc.conf]
-min_schema_version=5.0.8
+min_schema_version=5.1.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Prepare package for SUSE Multi-Linux Manager 5.1