Skip to content

Commit ecad68c

Browse files
committed
Fix packaging for Leap
Use the right python interpreter for Leap
1 parent 5be6828 commit ecad68c

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

.virtualenv.dev-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ wheel
2727
flake8
2828

2929
# for building documentation
30-
sphinx
30+
sphinx>=5.0.0
3131
sphinx_rtd_theme
3232

3333
# for release

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
html_theme = "sphinx_rtd_theme"
9292

93-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
93+
# html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
9494

9595
html_theme_options = {
9696
'collapse_navigation': False,

package/python-kiwi_stackbuild_plugin-spec-template

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,25 @@
1919

2020
# If they aren't provided by a system installed macro, define them
2121
%{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc}
22+
23+
%if 0%{?suse_version} && 0%{?suse_version} < 1600
24+
%global __python3 /usr/bin/python3.11
25+
%global python3_pkgversion 311
26+
%else
2227
%{!?__python3: %global __python3 /usr/bin/python3}
28+
%{!?python3_pkgversion:%global python3_pkgversion 3}
29+
%endif
2330

2431
%if %{undefined python3_sitelib}
2532
%global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
2633
%endif
2734

28-
%if 0%{?el7}
29-
%global python3_pkgversion 36
30-
%else
31-
%{!?python3_pkgversion:%global python3_pkgversion 3}
35+
%if %{undefined python3_version}
36+
%global python3_version %(%{__python3} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
37+
%endif
38+
39+
%if %{undefined python3_version_nodots}
40+
%global python3_version_nodots %(%{__python3} -Esc "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
3241
%endif
3342

3443
%if 0%{?debian} || 0%{?ubuntu}
@@ -85,11 +94,11 @@ image root directory
8594

8695
%build
8796
# Build Python 3 version
88-
python3 setup.py build
97+
%{__python3} setup.py build
8998

9099
%install
91100
# Install Python 3 version
92-
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb}
101+
%{__python3} setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?is_deb:--install-layout=deb}
93102

94103
# Install man pages and package documentation
95104
make buildroot=%{buildroot}/ docdir=%{_defaultdocdir}/ install

0 commit comments

Comments
 (0)