x/python-redfish
Code Issues Proposed changes

Improve build process

Browse Source 
- Fix bug in install on directory.
- Improve dependencies on RPMs.
- Adds support for redfish-check-cartridge in RPMs.
- Update pbconf content for new pb 0.14.x naming.

Change-Id: Ifd16e06660fe5945d88ca8f8ee6999e7c8a0d3b8
This commit is contained in:
Bruno Cornec 2016-06-27 21:01:04 +02:00 committed by Uggla
parent d4b3f046e9
commit 12a44a9115
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@ -11,7 +11,7 @@ export pkg=$5
# Documentation installation only # Documentation installation only
if [ $python = "doc" ]; then if [ $python = "doc" ]; then
install -d 755 $rootdir/$prefix/share/doc/$5/manual/html/_static install -m 755 -d $rootdir/$prefix/share/doc/$5/manual/html/_static
install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/$5/manual/html install -m 644 doc/build/singlehtml/*.html $rootdir/$prefix/share/doc/$5/manual/html
install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/$5/manual/html/_static install -m 644 doc/build/singlehtml/_static/* $rootdir/$prefix/share/doc/$5/manual/html/_static
install -m 644 doc/build/latex/*.pdf $rootdir/$prefix/share/doc/$5/manual/ install -m 644 doc/build/latex/*.pdf $rootdir/$prefix/share/doc/$5/manual/

6
pbconf/pbfilter/all.pbf
View File

@ -8,12 +8,10 @@
filter PBREPO = $pb->{'repo'} filter PBREPO = $pb->{'repo'}
# PBSRC is replaced by the source package location after the repo # PBSRC is replaced by the source package location after the repo
filter PBSRC = src/%{name}-%{version}.tar.gz filter PBSRC = src/%{name}-%{version}$pb->{'extdir'}.tar.gz
# Used if virtual name != real name (perl, ...)
#filter PBSRC = src/%{srcname}-%{version}.tar.gz
# PBVER is replaced by the version ($pb->{'ver'} in code) # PBVER is replaced by the version ($pb->{'ver'} in code)
filter PBVER = $pb->{'ver'}$pb->{'extdir'} filter PBVER = $pb->{'ver'}
# PBDATE is replaced by the date ($pb->{'date'} in code) # PBDATE is replaced by the date ($pb->{'date'} in code)
filter PBDATE = $pb->{'date'} filter PBDATE = $pb->{'date'}

4
pbconf/pbfilter/rpm.pbf
View File

@ -14,9 +14,9 @@ filter PBLIC = ASL 2.0
#filter PBDEP = #filter PBDEP =
# PBBDEP is replaced by the list of build dependencies # PBBDEP is replaced by the list of build dependencies
filter PBPYTHON2BDEP = make,python-devel,python-setuptools >= 18,python-sphinx >= 1.2.3,python-future >= 0.15.2,python-docopt >= 0.6.2,python-requests >= 2.9.1,python-simplejson >= 3.8.1,python-configparser >= 3.3.0,texlive,python-sphinx_rtd_theme filter PBPYTHON2BDEP = make,python-devel,python-setuptools >= 18,python-sphinx >= 1.2.3,python-future >= 0.15.2,python-docopt >= 0.6.2,python-requests >= 2.9.1,python-simplejson >= 3.8.1,python-configparser >= 3.3.0,texlive,python-sphinx_rtd_theme,python-pbr >= 0.8,python-tortilla >= 0.4.1
filter PBPYTHON2DEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-simplejson >= 3.8.1,python-requests >= 2.9.1,python-configparser >= 3.3.0,python-future >= 0.15.2 filter PBPYTHON2DEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-simplejson >= 3.8.1,python-requests >= 2.9.1,python-configparser >= 3.3.0,python-future >= 0.15.2
filter PBPYTHON3BDEP = python3-devel,python3-setuptools >= 18,python3-sphinx >= 1.2.3,python3-future >= 0.15.2,python3-docopt >= 0.6.2,python3-requests >= 2.9.1,python3-simplejson >= 3.8.1,texlive,python3-sphinx_rtd_theme filter PBPYTHON3BDEP = python3-devel,python3-setuptools >= 18,python3-sphinx >= 1.2.3,python3-future >= 0.15.2,python3-docopt >= 0.6.2,python3-requests >= 2.9.1,python3-simplejson >= 3.8.1,texlive,python3-sphinx_rtd_theme,python3-pbr >= 0.8,python3-tortilla >= 0.4.1
filter PBPYTHON3DEP = python3-docopt >= 0.6.2,python3-tortilla >= 0.4.1,python3-jinja2 >= 2.7.3,python3-simplejson >= 3.8.1,python3-requests >= 2.9.1 filter PBPYTHON3DEP = python3-docopt >= 0.6.2,python3-tortilla >= 0.4.1,python3-jinja2 >= 2.7.3,python3-simplejson >= 3.8.1,python3-requests >= 2.9.1
filter PBPYTHON3PKG = python3-redfish filter PBPYTHON3PKG = python3-redfish

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

@ -3,7 +3,6 @@
# #
%global with_python3 PBWITHPY3 %global with_python3 PBWITHPY3
Name: PBREALPKG Name: PBREALPKG
Version: PBVER Version: PBVER
Release: PBTAGPBSUF Release: PBTAGPBSUF
@ -42,7 +41,7 @@ PBDESC
Documentation Documentation
%prep %prep
%setup -q %setup -q -n %{name}-%{version}PBEXTDIR
# Fix for now as long as setuptools isn't more recent in distributions # Fix for now as long as setuptools isn't more recent in distributions
%if %{?with_python3} %if %{?with_python3}
PBPYTHON3FILTER PBPYTHON3FILTER
@ -89,6 +88,7 @@ popd
%exclude %{_docdir}/PBREALPKG/html %exclude %{_docdir}/PBREALPKG/html
%exclude %{_docdir}/PBREALPKG/*.pdf %exclude %{_docdir}/PBREALPKG/*.pdf
%{_bindir}/redfish-client %{_bindir}/redfish-client
%{_bindir}/redfish-check-cartridge
%dir %{_datadir}/redfish-client %dir %{_datadir}/redfish-client
%{_datadir}/redfish-client/templates/* %{_datadir}/redfish-client/templates/*
%config(noreplace) %{_sysconfdir}/redfish-client.conf %config(noreplace) %{_sysconfdir}/redfish-client.conf