From 2bfff304ed25857acbc9217bfb2acd8bfc85ece4 Mon Sep 17 00:00:00 2001
From: Bruno Cornec <bruno@victoria.frmug.org>
Date: Fri, 12 Feb 2016 15:50:34 +0100
Subject: [PATCH] Improved build for deb

- Add dependencies for deb build (NOTE: the mandatory python-tortilla
  package doesn't exist in Ubuntu or Debian for now)
- reduce setup.cfg in deliveries and fix OpenSTack related content
---
 pbconf/pbfilter/deb.pbf           |  2 +-
 pbconf/pbfilter/rpm.pbf           |  2 +-
 pbconf/python-redfish/deb/control |  1 +
 pbconf/python-redfish/deb/rules   |  5 +----
 setup.cfg                         | 28 ++++++++++++++--------------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pbconf/pbfilter/deb.pbf b/pbconf/pbfilter/deb.pbf
index c2c9c43..880e913 100644
--- a/pbconf/pbfilter/deb.pbf
+++ b/pbconf/pbfilter/deb.pbf
@@ -14,7 +14,7 @@ filter PBLIC = ASL 2.0
 filter PBDEP = python-docopt, python-tortilla, python-jinja2
 
 # PBBDEP is replaced by the list of build dependencies
-filter PBBDEP = python-dev, python-setuptools, python-pbr
+filter PBBDEP = python-dev, python-setuptools, python-pbr, python-tortilla, python-jinja2, python-sphinx
 
 # PBSUG is replaced by the list of suggestions
 #filter PBSUG =
diff --git a/pbconf/pbfilter/rpm.pbf b/pbconf/pbfilter/rpm.pbf
index 655a7e6..76d0d6f 100644
--- a/pbconf/pbfilter/rpm.pbf
+++ b/pbconf/pbfilter/rpm.pbf
@@ -14,7 +14,7 @@ filter PBLIC = ASL 2.0
 #filter PBDEP =
 
 # PBBDEP is replaced by the list of build dependencies
-filter PBBDEP = python-devel, python-setuptools
+filter PBBDEP = python-devel, python-setuptools, python-pbr, python-sphinx
 filter PBDEP = python-docopt, python-tortilla, python-jinja2
 
 # PBSUF is replaced by the package suffix ($pb->{'suf'} in code)
diff --git a/pbconf/python-redfish/deb/control b/pbconf/python-redfish/deb/control
index e1c4c74..e0f8e8f 100644
--- a/pbconf/python-redfish/deb/control
+++ b/pbconf/python-redfish/deb/control
@@ -4,6 +4,7 @@ Section: PBGRP
 Priority: optional
 Maintainer: PBPACKAGER
 Build-Depends: debhelper (>= 4.2.20), python-dev (>= 2.7), PBBDEP
+X-Python-Version: >= 2.7
 Standards-Version: PBDEBSTD
 Vcs-Svn: https://github.com/bcornec/PBPROJ
 Vcs-Browser: https://github.com/bcornec/PBPROJ
diff --git a/pbconf/python-redfish/deb/rules b/pbconf/python-redfish/deb/rules
index 6d52ab7..035b57c 100644
--- a/pbconf/python-redfish/deb/rules
+++ b/pbconf/python-redfish/deb/rules
@@ -5,12 +5,9 @@ export PYBUILD_AFTER_INSTALL_python3=rm -rf {destdir}/usr/bin
 
 %:
 		dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+		#dh $@ --with python2,python3 --buildsystem=python_distutils
 
 PYPI_DESC = PBSUMMARY
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 	help2man = PYTHONPATH=${CURDIR} help2man -N --version-string=${DEB_UPSTREAM_VERSION} \
 					-o $1 -n '$2' $(CURDIR)/debian/PBPKG/usr/bin/$(subst .1,,$1)
-
-clean:
-		#rm -f redfish-client.1
-		dh $@ --buildsystem=pybuild
diff --git a/setup.cfg b/setup.cfg
index d2858c6..0482d17 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,10 +4,10 @@ summary = Reference implementation of Redfish standard client.
 description-file =
     README.rst
 author = Redfish dev team
-author-email = python-redfish@lists.mondorescue.org
-home-page = http://www.openstack.org/
+author-email = python-redfish@mondorescue.org
+home-page = http://github.com/bcornec/python-redfish
 classifier =
-    Environment :: OpenStack
+    #Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
@@ -32,16 +32,16 @@ all_files = 1
 [upload_sphinx]
 upload-dir = doc/build/html
 
-[compile_catalog]
-directory = redfish/locale
-domain = python-redfish
+#[compile_catalog]
+#directory = redfish/locale
+#domain = python-redfish
 
-[update_catalog]
-domain = python-redfish
-output_dir = redfish/locale
-input_file = redfish/locale/python-redfish.pot
+#[update_catalog]
+#domain = python-redfish
+#output_dir = redfish/locale
+#input_file = redfish/locale/python-redfish.pot
 
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = redfish/locale/python-redfish.pot
+#[extract_messages]
+#keywords = _ gettext ngettext l_ lazy_gettext
+#mapping_file = babel.cfg
+#output_file = redfish/locale/python-redfish.pot