Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move rubygem-jquery-ui-rails package to katello #11004

Closed
wants to merge 1 commit into from
Closed

move rubygem-jquery-ui-rails package to katello #11004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/foreman/foreman/foreman.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%global dynflow_sidekiq_service_name dynflow-sidekiq@
%global rake /usr/bin/rake

%global release 1
%global release 2
%global prereleasesource develop
%global prerelease %{?prereleasesource}

Expand Down Expand Up @@ -198,7 +198,6 @@ BuildRequires: (npm(react-intl) >= 2.8.0 with npm(react-intl) < 3.0.0)
# end package.json dependencies BuildRequires

# start specfile assets BuildRequires
BuildRequires: (rubygem(jquery-ui-rails) >= 6.0 with rubygem(jquery-ui-rails) < 7.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still see a line here:
https://github.com/theforeman/foreman/blob/e78bd159584f2f8d09b3d57ab94615a2ae26ecb7/bundler.d/assets.rb#L2

So our automation would place this back

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made theforeman/foreman#10142 to remove it

BuildRequires: (rubygem(patternfly-sass) >= 3.59.4 with rubygem(patternfly-sass) < 3.60.0)
BuildRequires: (rubygem(gettext_i18n_rails_js) >= 1.4 with rubygem(gettext_i18n_rails_js) < 2.0)
BuildRequires: (rubygem(po_to_json) >= 1.1 with rubygem(po_to_json) < 2.0)
Expand Down Expand Up @@ -349,7 +348,6 @@ Requires: (npm(react-intl) >= 2.8.0 with npm(react-intl) < 3.0.0)
# end package.json dependencies Requires

# start specfile assets Requires
Requires: (rubygem(jquery-ui-rails) >= 6.0 with rubygem(jquery-ui-rails) < 7.0)
Requires: (rubygem(patternfly-sass) >= 3.59.4 with rubygem(patternfly-sass) < 3.60.0)
Requires: (rubygem(gettext_i18n_rails_js) >= 1.4 with rubygem(gettext_i18n_rails_js) < 2.0)
Requires: (rubygem(po_to_json) >= 1.1 with rubygem(po_to_json) < 2.0)
Expand Down Expand Up @@ -863,6 +861,9 @@ exit 0
%systemd_postun %{name}.socket

%changelog
* Thu Oct 31 2024 MariaAga <[email protected]> - 3.13.0-0.2.develop
- move jquery-ui-rails package to katello

* Tue Aug 20 2024 Patrick Creech <[email protected]> - 3.13.0-0.1.develop
- Bump version to 3.13-develop

Expand Down
9 changes: 8 additions & 1 deletion packages/katello/rubygem-katello/rubygem-katello.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global prereleasesource pre.master
%global prerelease %{?prereleasesource:.}%{?prereleasesource}
%global mainver 4.15.0
%global release 1
%global release 2

Name: rubygem-%{gem_name}
Version: %{mainver}
Expand Down Expand Up @@ -76,6 +76,10 @@ BuildRequires: (npm(react-bootstrap) >= 0.32.1 with npm(react-bootstrap) < 1.0.0
BuildRequires: (npm(use-deep-compare-effect) >= 1.6.1 with npm(use-deep-compare-effect) < 2.0.0)
# end package.json dependencies BuildRequires

# start specfile assets BuildRequires
BuildRequires: (rubygem(jquery-ui-rails) >= 6.0 with rubygem(jquery-ui-rails) < 7.0)
# end specfile assets BuildRequires
Comment on lines +79 to +81
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a bit of autoupdate magic. assets in foreman.spec mapped to https://github.com/theforeman/foreman/blob/develop/bundler.d/assets.rb. We don't have bundler.d in katell. Instead, we have the section start specfile generated dependencies which maps to https://github.com/Katello/katello/blob/e99f9e93a3578886e13f9bb451e14c3d637c6880/katello.gemspec#L29-L68

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I should keep both BuildRequires and Requires then?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For rubygem-katello.spec (and all rubygem-*.spec really) it should autogenerate Requires, so no need for that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed the Requires


%description
Katello adds Content and Subscription Management to Foreman. For this it
relies on Candlepin and Pulp.
Expand Down Expand Up @@ -168,6 +172,9 @@ done
%{foreman_plugin_log}

%changelog
* Thu Oct 31 2024 MariaAga <[email protected]> - 4.15.0-0.2.pre.master
- move jquery-ui-rails package to katello

* Tue Aug 20 2024 Chris Roberts <[email protected]> - 4.15.0-0.1.pre.master
- Bump version to 4.15.0

Expand Down