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 path for files in /usr/share #285

Merged

Conversation

inknos
Copy link
Collaborator

@inknos inknos commented Feb 13, 2023

Some files got added twice in f8e861b

@jan-kolarik
Copy link
Member

Maybe I am missing something, but I don't see those files anywhere else in the .spec file?

@@ -173,9 +173,6 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
%{_prefix}/share/dnf5
%dir %{_sysconfdir}/dnf/dnf5-aliases.d
%doc %{_sysconfdir}/dnf/dnf5-aliases.d/README
%dir %{_prefix}/lib/dnf5
%dir %{_prefix}/lib/dnf5/aliases.d
%config %{_prefix}/lib/dnf5/aliases.d/compatibility.conf
Copy link
Member

@m-blaha m-blaha Feb 14, 2023

Choose a reason for hiding this comment

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

I think the problem here is a bit different here. %{_prefix}/lib/dnf5 translates to /usr/lib/dnf5 but we do not ship any files in this location.
But we do have files in /usr/share/dnf5/ which is %{_datadir}/dnf5/. I suggest to replace %{_prefix}/lib/dnf5 with %{_datadir}/dnf5 on these three lines and remove %{_prefix}/share/dnf5 on line 173.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

oh, I had the description wrong. The files are indeed duplicate in /usr/share/dnf5, which we ship.
originally aliases.d and such were in /usr/lib but got moved in /usr/share.
The pr intends to remove the duplicate files in /usr/share/dnf5 but mistakenly I confused the path in the description.

I will update the pr accordingly to what proposed

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@m-blaha 👍🏻

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I see, thanks. The clang builds are failing on rawhide again, but that's a different issue.

@m-blaha m-blaha self-assigned this Feb 14, 2023
@inknos inknos force-pushed the ns-duplicate-files-spec branch from d71e821 to 446c1d0 Compare February 14, 2023 10:31
@inknos inknos changed the title Remove duplicate files from specfile Fix path for files in /usr/share Feb 14, 2023
@inknos inknos force-pushed the ns-duplicate-files-spec branch from 446c1d0 to 3791a61 Compare February 14, 2023 10:36
@@ -173,9 +173,6 @@ It supports RPM packages, modulemd modules, and comps groups & environments.
%{_prefix}/share/dnf5
%dir %{_sysconfdir}/dnf/dnf5-aliases.d
%doc %{_sysconfdir}/dnf/dnf5-aliases.d/README
%dir %{_prefix}/lib/dnf5
%dir %{_prefix}/lib/dnf5/aliases.d
%config %{_prefix}/lib/dnf5/aliases.d/compatibility.conf
Copy link
Member

Choose a reason for hiding this comment

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

Oh, I see, thanks. The clang builds are failing on rawhide again, but that's a different issue.

@m-blaha m-blaha merged commit 25e6d21 into rpm-software-management:main Feb 14, 2023
@inknos inknos deleted the ns-duplicate-files-spec branch June 27, 2023 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants