diff --git a/package_manifest.yaml b/package_manifest.yaml index 8ced20fb69..6f7b764264 100644 --- a/package_manifest.yaml +++ b/package_manifest.yaml @@ -85,18 +85,6 @@ copr_projects: comps_file: "{{ inventory_dir }}/comps/comps-foreman-plugins-el{{ rhel_9 }}.xml" buildroot_packages: "{{ core_buildroot_packages }}" katello-copr: - copr_project_name: "katello-{{ katello_version }}-staging" - copr_project_fork_from: "{{ 'katello-nightly-staging' if foreman_version != 'nightly' else False }}" - copr_project_chroots: - - name: "rhel-{{ rhel_8 }}-x86_64" - modules: "{{ core_modules_el8 }}" - external_repos: - - "{{ foreman_staging }}/rhel-{{ rhel_8 }}-x86_64" - - "{{ plugins_staging }}/rhel-{{ rhel_8 }}-x86_64" - - "{{ katello_staging }}/rhel-{{ rhel_8 }}-x86_64" - comps_file: "{{ inventory_dir }}/comps/comps-katello-el{{ rhel_8 }}.xml" - buildroot_packages: "{{ core_buildroot_packages }}" - katello-copr-with-el9: copr_project_name: "katello-{{ katello_version }}-staging" copr_project_fork_from: "{{ 'katello-nightly-staging' if foreman_version != 'nightly' else False }}" copr_project_chroots: @@ -632,9 +620,6 @@ katello_packages: source_system: jenkins katello_hammer_packages: - vars: - copr_projects: - - "{{ hostvars['katello-copr-with-el9'] }}" hosts: rubygem-hammer_cli_foreman_rh_cloud: {} rubygem-hammer_cli_foreman_scc_manager: {} @@ -644,9 +629,6 @@ katello_hammer_packages: source_system: jenkins katello_ruby_packages: - vars: - copr_projects: - - "{{ hostvars['katello-copr-with-el9'] }}" hosts: rubygem-activerecord-import: {} rubygem-anemone: {} @@ -667,9 +649,6 @@ katello_ruby_packages: rubygem-zest: {} katello_common_packages: - vars: - copr_projects: - - "{{ hostvars['katello-copr-with-el9'] }}" hosts: katello: {} katello-client-bootstrap: {} @@ -678,9 +657,6 @@ katello_common_packages: rhel8-kickstart-setup: {} katello_nodejs_packages: - vars: - copr_projects: - - "{{ hostvars['katello-copr-with-el9'] }}" hosts: nodejs-angular: {} nodejs-bootstrap-select: {} diff --git a/packages/katello/rubygem-katello/rubygem-katello.spec b/packages/katello/rubygem-katello/rubygem-katello.spec index 299eef0898..173f3f3863 100644 --- a/packages/katello/rubygem-katello/rubygem-katello.spec +++ b/packages/katello/rubygem-katello/rubygem-katello.spec @@ -6,7 +6,7 @@ %global prereleasesource pre.master %global prerelease %{?prereleasesource:.}%{?prereleasesource} %global mainver 4.12.0 -%global release 2 +%global release 3 Name: rubygem-%{gem_name} Version: %{mainver} @@ -24,10 +24,10 @@ Requires: (katello-selinux if selinux-policy-targeted) Requires: foreman >= %{foreman_min_version} BuildRequires: foreman-assets >= %{foreman_min_version} BuildRequires: foreman-plugin >= %{foreman_min_version} -Requires: ruby >= 2.5 -Requires: ruby < 3 -BuildRequires: ruby >= 2.5 -BuildRequires: ruby < 3 +Requires: ruby >= 2.7 +Requires: ruby < 3.1 +BuildRequires: ruby >= 2.7 +BuildRequires: ruby < 3.1 BuildRequires: rubygems-devel > 1.3.1 BuildRequires: rubygem(rails) BuildRequires: rubygem(json) @@ -170,6 +170,9 @@ done %{foreman_plugin_log} %changelog +* Mon Feb 12 2024 Evgeni Golov - 4.12.0-0.3.pre.master +- Correct (Build)Requirements for EL9 + * Fri Feb 09 2024 Eric D. Helms - 4.12.0-0.2.pre.master - Drop nodejs-downshift dependency