Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.package
Commits
76daed41
Commit
76daed41
authored
Aug 04, 2020
by
Thomas Gambier
🚴🏼
Committed by
Rafael Monnerat
Sep 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build for suse and fedora (use python2)
parent
429f9d3c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
15 deletions
+3
-15
obs/slapos/templates/slapos.spec.in
obs/slapos/templates/slapos.spec.in
+3
-15
No files found.
obs/slapos/templates/slapos.spec.in
View file @
76daed41
...
...
@@ -46,21 +46,9 @@ URL: http://community.slapos.org/
Vendor: Vifib
Packager: Rafael Monnerat <rafael@nexedi.com>
%if 0%{?suse_version}
%if 0%{?suse_version} == 1210
BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel, python-xml
BuildRequires: gcc-c++, make, patch, wget, python2, python-devel, chrpath, openssl-devel
Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-xml, lm_sensors
%else
BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel, python-xml
Requires: bridge-utils, python, gcc-c++, make, patch, wget, python-xml, lm_sensors
%endif
%else
BuildRequires: gcc-c++, make, patch, wget, python, python-devel, chrpath, openssl-devel
Requires: bridge-utils, python, gcc-c++, make, patch, wget, lm_sensors
%endif
Requires: bridge-utils, python2, gcc-c++, make, patch, wget, lm_sensors
AutoReqProv: no
...
...
@@ -89,7 +77,7 @@ zcat $RPM_SOURCE_DIR/slapos-node_%{unmangled_version}+%{slapversion}+%{release_n
%build
cd $RPM_BUILD_DIR/slapos-node_%{unmangled_version}+%{slapversion}+%{release_number}
make
make
PYTHON=python2
%install
cd $RPM_BUILD_DIR/slapos-node_%{unmangled_version}+%{slapversion}+%{release_number}/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment