Fix RPM build for 0.3
- Adds entry for management of /var/log/python-redfish by the RPM (not used I think it shouldn't be handled that way) - python-requests >= 2.9.1 is a mandatory installation dep - Removal for now of the python3 compatible line causing problems with setuptools
This commit is contained in:
parent
993f3f2825
commit
04e5591443
11
install.sh
11
install.sh
@ -1,22 +1,29 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Syntax: install.sh <Root Dir> <Python SiteLib> <Prefix>
|
# Syntax: install.sh <Root Dir> <Python SiteLib> <Prefix> <Logging Dir>
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
export rootdir=$1
|
export rootdir=$1
|
||||||
export sitelib=$2
|
export sitelib=$2
|
||||||
export prefix=$3
|
export prefix=$3
|
||||||
#python setup.py install --skip-build --prefix=$prefix
|
#export varlog=$4
|
||||||
|
|
||||||
python setup.py install --skip-build --root=$rootdir --prefix=$prefix
|
python setup.py install --skip-build --root=$rootdir --prefix=$prefix
|
||||||
rm -rf $rootdir/$sitelib/redfish/old
|
rm -rf $rootdir/$sitelib/redfish/old
|
||||||
|
|
||||||
|
# Documentation installation
|
||||||
for i in 1; do
|
for i in 1; do
|
||||||
mkdir -p $rootdir/$prefix/share/man/man$i
|
mkdir -p $rootdir/$prefix/share/man/man$i
|
||||||
install -m 644 doc/build/man/*.$i $rootdir/$prefix/share/man/man$i
|
install -m 644 doc/build/man/*.$i $rootdir/$prefix/share/man/man$i
|
||||||
done
|
done
|
||||||
|
|
||||||
install -d 755 $rootdir/$prefix/share/doc/PBPKG/html/_static
|
install -d 755 $rootdir/$prefix/share/doc/PBPKG/html/_static
|
||||||
install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/PBPKG/html
|
install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/PBPKG/html
|
||||||
install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/PBPKG/html/_static
|
install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/PBPKG/html/_static
|
||||||
|
|
||||||
# Hardcoded for now to solve the delivery of the conf file still not correct with setup.py
|
# Hardcoded for now to solve the delivery of the conf file still not correct with setup.py
|
||||||
mkdir -p $rootdir/etc
|
mkdir -p $rootdir/etc
|
||||||
mv $rootdir/$prefix/etc/redfish-client.conf $rootdir/etc/redfish-client.conf
|
mv $rootdir/$prefix/etc/redfish-client.conf $rootdir/etc/redfish-client.conf
|
||||||
|
|
||||||
|
# Log files management
|
||||||
|
#mkdir -p $rootdir/$varlog/PBPKG
|
||||||
|
@ -15,7 +15,7 @@ filter PBLIC = ASL 2.0
|
|||||||
|
|
||||||
# PBBDEP is replaced by the list of build dependencies
|
# PBBDEP is replaced by the list of build dependencies
|
||||||
filter PBBDEP = python-devel,python-setuptools,python-pbr >= 0.8,python-sphinx >= 1.3.1,python-future >= 0.15.2
|
filter PBBDEP = python-devel,python-setuptools,python-pbr >= 0.8,python-sphinx >= 1.3.1,python-future >= 0.15.2
|
||||||
filter PBDEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-pbr >= 0.8,python-simplejson >= 3.8.1
|
filter PBDEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-pbr >= 0.8,python-simplejson >= 3.8.1,python-requests >= 2.9.1
|
||||||
|
|
||||||
# PBSUF is replaced by the package suffix ($pb->{'suf'} in code)
|
# PBSUF is replaced by the package suffix ($pb->{'suf'} in code)
|
||||||
filter PBSUF = $pb->{'suf'}
|
filter PBSUF = $pb->{'suf'}
|
||||||
|
@ -23,14 +23,15 @@ PBDESC
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%{__python} setup.py build
|
%{__python} setup.py build
|
||||||
# Deal with doc
|
|
||||||
|
# Build minimal documentation
|
||||||
cd doc
|
cd doc
|
||||||
make man
|
make man
|
||||||
make singlehtml
|
make singlehtml
|
||||||
make latexpdf
|
make latexpdf
|
||||||
|
|
||||||
%install
|
%install
|
||||||
./install.sh %{buildroot} %{python_sitelib} %{_prefix}
|
./install.sh %{buildroot} %{python_sitelib} %{_prefix} #%{_logdir}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.rst examples/[a-z]*.py LICENSE
|
%doc README.rst examples/[a-z]*.py LICENSE
|
||||||
@ -44,5 +45,6 @@ make latexpdf
|
|||||||
%{python_sitelib}/redfish/tests/*.py*
|
%{python_sitelib}/redfish/tests/*.py*
|
||||||
%{python_sitelib}/python_redfish*
|
%{python_sitelib}/python_redfish*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
#%{_logdir}/PBREALPKG
|
||||||
%changelog
|
%changelog
|
||||||
PBLOG
|
PBLOG
|
||||||
|
@ -8,7 +8,8 @@ Jinja2>=2.7.3
|
|||||||
Sphinx>=1.2.3
|
Sphinx>=1.2.3
|
||||||
docopt>=0.6.2
|
docopt>=0.6.2
|
||||||
simplejson>=3.8.1
|
simplejson>=3.8.1
|
||||||
|
requests>=2.9.1
|
||||||
|
|
||||||
# Python3 compat
|
# Python3 compat
|
||||||
future>=0.15.2
|
future>=0.15.2
|
||||||
configparser>=3.3.0; python_version < '3'
|
#configparser>=3.3.0; python_version < '3'
|
||||||
|
Loading…
Reference in New Issue
Block a user