x/python-redfish
Code Issues Proposed changes

Merge "Fix RPM build"

Browse Source
This commit is contained in:
Jenkins 2017-02-14 08:47:21 +00:00 committed by Gerrit Code Review
commit b242bb8294
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ License: PBLIC
Group: PBGRP
Url: PBURL
Source: PBREPO/PBSRC
Requires: PBPYTHON2DEP
Requires: PBPYTHON2DEP,PBREALPKG-data
BuildArch: noarch
BuildRequires: PBPYTHON2BDEP, PB2PYTHON2BDEP
@ -23,8 +23,8 @@ Python2 version.
%if %{?with_python3}
%package -n PBPYTHON3PKG
Summary: %{summary} / Python 3 library
BuildRequires: PBPYTHON3BDEP, PB2PYTHON3BDEP
Requires: PBPYTHON3DEP
BuildRequires: PBPYTHON3BDEP,PB2PYTHON3BDEP
Requires: PBPYTHON3DEP,PBREALPKG-data
%description -n PBPYTHON3PKG
PBDESC
@ -33,13 +33,20 @@ Python3 version.
%package -n PBREALPKG-doc
Summary: %{summary} / Documentation
BuildRequires: PBPYTHON2BDEP, PB2PYTHON2BDEP
BuildRequires: PBPYTHON2BDEP,PB2PYTHON2BDEP
Requires: PBPYTHON2DEP
%description -n PBREALPKG-doc
PBDESC
Documentation
%package -n PBREALPKG-data
Summary: %{summary} / Data
%description -n PBREALPKG-data
PBDESC
Data
%prep
%setup -q -n %{name}-%{version}PBEXTDIR
# Fix for now as long as setuptools isn't more recent in distributions
@ -68,6 +75,15 @@ make singlehtml
make latexpdf
%install
%if %{?with_python3}
pushd %{py3dir}
./install.sh %{__python3} %{buildroot} %{python3_sitelib} %{_prefix} PBPYTHON3PKG
mv %{buildroot}%{_bindir}/redfish-client %{buildroot}%{_bindir}/redfish-client-%{python3_version}
mv %{buildroot}%{_bindir}/redfish-check-cartridge %{buildroot}%{_bindir}/redfish-check-cartridge-%{python3_version}
popd
%endif # if with_python3
./install.sh %{__python} %{buildroot} %{python_sitelib} %{_prefix} PBPKG
./install.sh doc %{buildroot} %{python_sitelib} %{_prefix} PBPKG
@ -77,24 +93,16 @@ for i in `ls %{buildroot}/%{_mandir}/man1/*-py2.1*`; do
cp -a $i $j
done
%if %{?with_python3}
pushd %{py3dir}
./install.sh %{__python3} %{buildroot} %{python3_sitelib} %{_prefix} PBPYTHON3PKG
popd
%endif # if with_python3
%files
%doc README.rst examples/[a-z]*.py LICENSE
%exclude %{_docdir}/PBREALPKG/html
%exclude %{_docdir}/PBREALPKG/*.pdf
%doc README.rst examples/[a-z]*.py LICENSE AUTHORS ChangeLog
%exclude %{_docdir}/PBREALPKG/manual/html
%exclude %{_docdir}/PBREALPKG/manual/*.pdf
%{_bindir}/redfish-client
%{_bindir}/redfish-check-cartridge
%dir %{_datadir}/redfish-client
%{_datadir}/redfish-client/templates/*
%config(noreplace) %{_sysconfdir}/redfish-client.conf
%dir %{python_sitelib}/redfish
%{python_sitelib}/redfish/*.py*
%{python_sitelib}/redfish/oem/*.py*
%{python_sitelib}/redfish/tests/*.py*
%{python_sitelib}/python_redfish*
# Needs improvement to host all .1 man pages but not the py3 ones
%{_mandir}/man1/PBREALPKG.1*
@ -103,15 +111,27 @@ popd
%if %{?with_python3}
%files -n PBPYTHON3PKG
%doc README.rst examples/[a-z]*.py LICENSE AUTHORS ChangeLog
%exclude %{_docdir}/PBREALPKG/manual/html
%exclude %{_docdir}/PBREALPKG/manual/*.pdf
%{_bindir}/redfish-client-%{python3_version}
%{_bindir}/redfish-check-cartridge-%{python3_version}
%dir %{python3_sitelib}/redfish
%{python3_sitelib}/redfish/*.py*
%{python3_sitelib}/redfish/oem/*.py*
%{python3_sitelib}/redfish/oem/__pycache__/*.py*
%{python3_sitelib}/redfish/__pycache__/*.py*
%{python3_sitelib}/redfish/tests/*.py*
%{python3_sitelib}/redfish/tests/__pycache__/*.py*
%{python3_sitelib}/python_redfish*
%{_mandir}/man1/*-py3.1*
%endif # if with_python3
%files -n PBREALPKG-data
%config(noreplace) %{_sysconfdir}/redfish-client.conf
%dir %{_datadir}/redfish-client
%{_datadir}/redfish-client/templates/*
%{_datadir}/redfish-client/*.txt
%files -n PBREALPKG-doc
%{_docdir}/PBREALPKG/manual/html/_static/*
%{_docdir}/PBREALPKG/manual/html/index.html