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

Add GConf2 dependency in rpm spec template #16016

Merged
merged 1 commit into from
Dec 14, 2016
Merged
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions resources/linux/rpm/code.spec.template
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ License: MIT
URL: https://code.visualstudio.com/
Icon: @@NAME@@.xpm
Requires: glibc >= 2.15
Requires: GConf2
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the PR! Will this work for both 32 and 64 bit across most distributions? We had some issues with libXss.so.1 where installation failed because the package was not found in the local package manager..

Copy link
Contributor Author

@xadhoom xadhoom Nov 29, 2016

Choose a reason for hiding this comment

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

Yes, because I'm mentioning a package name and not a library name.
When you mention a package name, if you omit the arch, the current system arch will be used.
(is also possible to force the arch on a package dep but I'm not doing it on purpose).

Copy link
Member

Choose a reason for hiding this comment

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

The problem with libXss though was that the package name differed depending on the OS, some were libXss, some were libXScrnSaver I believe.

Copy link
Member

Choose a reason for hiding this comment

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

I think we actually want to do what we do for libXss.so.1 here and have a separate one for 64-bit and 32-bit:

libgconf-2.so.4

libgconf-2.so.4()(64bit)

Chromium seems to do it this way in https://cs.chromium.org/chromium/src/chrome/installer/linux/rpm/expected_deps_x86_64?dr=C&sq=package:chromium

Copy link
Member

Choose a reason for hiding this comment

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

I'll follow up with this, thanks for the contribution 😄

%ifarch x86_64
Requires: libXss.so.1()(64bit)
%else
Expand Down