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.

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

fix spec for rubygem #836

Merged
merged 1 commit into from
Nov 2, 2023
Merged

fix spec for rubygem #836

merged 1 commit into from
Nov 2, 2023

Conversation

jreidinger
Copy link
Contributor

Problem

The change to agama.yaml and move to web.yaml cause build failure of rubygem-agama

Solution

Fix it

Testing

  • Tested osc build on modified source

@coveralls
Copy link

Coverage Status

coverage: 75.045%. remained the same when pulling 891cffc on fix_rubygem_build into 6e44336 on master.

@@ -10,6 +10,7 @@
install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/org.opensuse.Agama*.service
install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama.service %{buildroot}%{_unitdir}/agama.service
install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama-proxy-setup.service %{buildroot}%{_unitdir}/agama-proxy-setup.service
install --directory %{buildroot}/usr/lib/agama.d/
Copy link
Contributor

Choose a reason for hiding this comment

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

Having a look to the Filesystem Hierarchy Standard, I would expect configuration files to be under /usr/share. Something like /usr/share/agama/conf.d. WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

However, I see modprobe.d, pam.d, etc. under /usr/lib too.

Copy link
Contributor

Choose a reason for hiding this comment

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

If I remember correctly we were told to put it under /usr/share already #602 (comment).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is possible, but in that case we need to change path also in config file https://github.com/openSUSE/agama/blob/master/service/lib/agama/config_reader.rb#L46
@teclator as you are author of location how do you see it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so lets merge this one now to fix build failure and prepare new PR with location change.

@@ -10,6 +10,7 @@
install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/org.opensuse.Agama*.service
install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama.service %{buildroot}%{_unitdir}/agama.service
install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama-proxy-setup.service %{buildroot}%{_unitdir}/agama-proxy-setup.service
install --directory %{buildroot}/usr/lib/agama.d/
Copy link
Contributor

Choose a reason for hiding this comment

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

However, I see modprobe.d, pam.d, etc. under /usr/lib too.

@jreidinger jreidinger merged commit 19ca440 into master Nov 2, 2023
8 checks passed
@jreidinger jreidinger deleted the fix_rubygem_build branch November 2, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants