Skip to content

Commit 1b68190

Browse files
bcornecBruno Cornec
authored andcommitted
Adaptations for OpenSUSE 15.1 build
And tag for version 0.4.4 Change-Id: I82516b1d2aac776c154b1e6b2b52a12d4ab7e5fa
1 parent fd139ab commit 1b68190

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pbconf/pbfilter/opensuse.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
# Specific group for OpenSUSE for python-redfish
33
filter:
4-
PB2PYTHON3BDEP: python3-Sphinx >= 1.2.3,python3-colorclass,python3-formats
4+
PB2PYTHON3BDEP: python3-Sphinx >= 1.2.3,python3-Sphinx-latex,python3-colorclass,python3-formats
55
PBGRP: Development/Python
66
PBPYTHONDOCBDEP: texlive-latex-bin,texlive-cmap,texlive-fancyhdr,texlive-fancybox,texlive-mdwtools,texlive-parskip,texlive-babel-english,texlive-psnfss,texlive-fncychap,texlive-titlesec,texlive-tabulary,texlive-framed,texlive-fancyvrb,texlive-threeparttable,texlive-float,texlive-wrapfig,texlive-upquote,texlive-capt-of,texlive-multirow,texlive-eqparbox,texlive-metafont-bin,texlive-helvetic,texlive-courier,texlive-dvips,texlive-times
7-
PB2PYTHON2BDEP: python-Sphinx >= 1.2.3,python-colorclass,python-formats
7+
PBPYTHON2BDEP: make,python2-devel,python2-setuptools >= 18,python2-future >= 0.15.2,python2-docopt >= 0.6.2,python2-requests >= 2.9.1,python2-simplejson >= 3.8.1,python2-configparser >= 3.3.0,python2-sphinx_rtd_theme,python2-pbr >= 0.8,python-tortilla >= 0.4.1
8+
PB2PYTHON2BDEP: python2-Sphinx >= 1.2.3,python2-colorclass,python-formats
89
PBPYTHON3FILTER: perl -pi -e "s|configparser>=3.3.0; python_version < '3'|configparser>=3.3.0|" requirements.txt$/%define py3dir %{_builddir}/python3-%{name}-%{version}-%{release}$/%define __python3 /usr/bin/python3$/%define python3_version %{py3_ver}
910
#
1011
# PBLIC is replaced by the license of the application

pbconf/python-redfish/rpm/python-redfish.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ make latexpdf
7878
%if %{?with_python3}
7979
pushd %{py3dir}
8080
./install.sh %{__python3} %{buildroot} %{python3_sitelib} %{_prefix} PBPYTHON3PKG
81-
mv %{buildroot}%{_bindir}/redfish-client %{buildroot}%{_bindir}/redfish-client-%{python3_version}
82-
mv %{buildroot}%{_bindir}/redfish-check-cartridge %{buildroot}%{_bindir}/redfish-check-cartridge-%{python3_version}
81+
mv %{buildroot}%{_bindir}/redfish-client %{buildroot}%{_bindir}/redfish-client-3
82+
mv %{buildroot}%{_bindir}/redfish-check-cartridge %{buildroot}%{_bindir}/redfish-check-cartridge-3
8383
popd
8484
%endif # if with_python3
8585

@@ -112,8 +112,8 @@ done
112112
%doc README.rst examples/[a-z]*.py LICENSE AUTHORS ChangeLog
113113
%exclude %{_docdir}/PBREALPKG/manual/html
114114
%exclude %{_docdir}/PBREALPKG/manual/*.pdf
115-
%{_bindir}/redfish-client-%{python3_version}
116-
%{_bindir}/redfish-check-cartridge-%{python3_version}
115+
%{_bindir}/redfish-client-3
116+
%{_bindir}/redfish-check-cartridge-3
117117
%dir %{python3_sitelib}/redfish
118118
%{python3_sitelib}/redfish/*.py*
119119
%{python3_sitelib}/redfish/oem/*.py*

0 commit comments

Comments
 (0)