x/python-redfish
Code Issues Proposed changes

Adaptations for OpenSUSE 15.1 build

Browse Source 
And tag for version 0.4.4

Change-Id: I82516b1d2aac776c154b1e6b2b52a12d4ab7e5fa
This commit is contained in:
Bruno Cornec 2019-10-31 02:12:26 +01:00 committed by Bruno Cornec
parent fd139abdea
commit 1b68190b51
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pbconf/pbfilter/opensuse.yml
View File

@ -1,10 +1,11 @@
--- ---
# Specific group for OpenSUSE for python-redfish # Specific group for OpenSUSE for python-redfish
filter: filter:
PB2PYTHON3BDEP: python3-Sphinx >= 1.2.3,python3-colorclass,python3-formats PB2PYTHON3BDEP: python3-Sphinx >= 1.2.3,python3-Sphinx-latex,python3-colorclass,python3-formats
PBGRP: Development/Python PBGRP: Development/Python
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 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
PB2PYTHON2BDEP: python-Sphinx >= 1.2.3,python-colorclass,python-formats 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
PB2PYTHON2BDEP: python2-Sphinx >= 1.2.3,python2-colorclass,python-formats
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} 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}
# #
# PBLIC is replaced by the license of the application # PBLIC is replaced by the license of the application

8
pbconf/python-redfish/rpm/python-redfish.spec
View File

@ -78,8 +78,8 @@ make latexpdf
%if %{?with_python3} %if %{?with_python3}
pushd %{py3dir} pushd %{py3dir}
./install.sh %{__python3} %{buildroot} %{python3_sitelib} %{_prefix} PBPYTHON3PKG ./install.sh %{__python3} %{buildroot} %{python3_sitelib} %{_prefix} PBPYTHON3PKG
mv %{buildroot}%{_bindir}/redfish-client %{buildroot}%{_bindir}/redfish-client-%{python3_version} mv %{buildroot}%{_bindir}/redfish-client %{buildroot}%{_bindir}/redfish-client-3
mv %{buildroot}%{_bindir}/redfish-check-cartridge %{buildroot}%{_bindir}/redfish-check-cartridge-%{python3_version} mv %{buildroot}%{_bindir}/redfish-check-cartridge %{buildroot}%{_bindir}/redfish-check-cartridge-3
popd popd
%endif # if with_python3 %endif # if with_python3
@ -112,8 +112,8 @@ done
%doc README.rst examples/[a-z]*.py LICENSE AUTHORS ChangeLog %doc README.rst examples/[a-z]*.py LICENSE AUTHORS ChangeLog
%exclude %{_docdir}/PBREALPKG/manual/html %exclude %{_docdir}/PBREALPKG/manual/html
%exclude %{_docdir}/PBREALPKG/manual/*.pdf %exclude %{_docdir}/PBREALPKG/manual/*.pdf
%{_bindir}/redfish-client-%{python3_version} %{_bindir}/redfish-client-3
%{_bindir}/redfish-check-cartridge-%{python3_version} %{_bindir}/redfish-check-cartridge-3
%dir %{python3_sitelib}/redfish %dir %{python3_sitelib}/redfish
%{python3_sitelib}/redfish/*.py* %{python3_sitelib}/redfish/*.py*
%{python3_sitelib}/redfish/oem/*.py* %{python3_sitelib}/redfish/oem/*.py*