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

Jump to bottom

Fixes #15731: packages fail to build on rpm #2080

Merged
merged 1 commit into from
Sep 17, 2019
Merged

Fixes #15731: packages fail to build on rpm #2080

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
8 changes: 4 additions & 4 deletions rudder-server-relay/SPECS/dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sles-12:pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-15:pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-7:selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-8:selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-12:python-devel python-setuptools python-lxml python-requests pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
sles-15:python3-devel python3-pip python3-lxml python3-requests pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-7:python-devel python-setuptools pythons-libs python-lxml python-requests selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rhel-8:python3-devel python3-pip python3-lxml python3-requests selinux-policy-devel pkgconfig postgresql-devel openssl-devel zlib-devel xz-devel
rust:yes
12 changes: 8 additions & 4 deletions rudder-server-relay/SPECS/rudder-server-relay.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,21 @@ Requires: pwdutils cron
# This should not be here because relay and webapp configuration is in a single file : /etc/sysconfig/rudder-relay-apache
# We could remove this when we split it or when we remove wsgi from rudder-webapp
%if 0%{?suse_version} && 0%{?suse_version} < 1500
Requires: apache2-mod_wsgi, python-pyOpenSSL
BuildRequires: python
Requires: python, apache2-mod_wsgi, python-pyOpenSSL
%endif
%if 0%{?suse_version} && 0%{?suse_version} >= 1500
Requires: apache2-mod_wsgi-python3
BuildRequires: python3
Requires: python3, apache2-mod_wsgi-python3
%endif


## Python (used by rudder package command)
## Python
%if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
Requires: python, python-lxml, python-requests
BuildRequires: python, python-pip, python-lxml, python-requests
Requires: python, python-setuptools, python-lxml, python-requests
%else
BuildRequires: python3, python3-pip, python3-lxml, python3-requests
Requires: python3, python3-lxml, python3-requests
%endif

Expand Down
2 changes: 1 addition & 1 deletion rudder-server-relay/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: rudder-server-relay
Section: web
Priority: extra
Maintainer: Rudder Team <dev@rudder.io>
Build-Depends: debhelper (>= 9), ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, systemd
Build-Depends: debhelper (>= 9), python3-dev, python3-setuptools, python3-pip, python3-distutils|libpython3.5-stdlib, python3-requests, python3-lxml, ca-certificates, curl, pkg-config, libpq-dev, libssl-dev, zlib1g-dev, systemd
Standards-Version: 3.8.0
Homepage: https://www.rudder.io

Expand Down