From 3c25e95495faa2ac44d6f5a04035baf0a0818a5c Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 9 Nov 2016 20:36:21 +0000
Subject: [PATCH] Switch to using pbr to build the package

---
 MANIFEST.in |  3 ---
 setup.cfg   | 57 ++++++++++++++++++++++++++++++++++++++++++
 setup.py    | 72 +++++++++++------------------------------------------
 3 files changed, 71 insertions(+), 61 deletions(-)
 delete mode 100644 MANIFEST.in
 create mode 100644 setup.cfg

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 17c6c31..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,3 +0,0 @@
-include LICENSE README.md scripts/novajoin-install scripts/novajoin-ipa-setup scripts/novajoin-notify scripts/novajoin-server
-recursive-include files *.json *.template *.ini
-recursive-include man *.1
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..d4438c2
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,57 @@
+[metadata]
+name = novajoin
+version = 1.0.6
+description = Nova integration to enroll IPA clients
+author = Rob Crittenden
+author_email = rcritten@redhat.com
+homepage = https://github.com/rcritten/novajoin
+classifier =
+    Environment :: OpenStack
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    Intended Audience :: Developers
+    Topic :: Utilities
+    License :: OSI Approved :: Apache Software License
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Development Status :: 3 - Alpha
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[files]
+data_files =
+    /usr/share/novajoin =
+        files/cloud-config.json
+        files/freeipa.json
+        files/join.conf.template
+    /etc/join = files/api-paste.ini
+    /usr/sbin =
+        scripts/novajoin-notify
+        scripts/novajoin-server
+        scripts/novajoin-install
+    /usr/libexec = scripts/novajoin-ipa-setup
+    /usr/share/man/man1 =
+        man/novajoin-install.1
+        man/novajoin-notify.1
+        man/novajoin-server.1
+
+packages =
+    novajoin
+
+[build_sphinx]
+source-dir = doc/source
+build-dir = doc/build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = docs/html
+
+[wheel]
+universal = 1
+
+[pbr]
+skip_authors = True
+skip_changelog = True
diff --git a/setup.py b/setup.py
index e377ebc..be0fbcd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,63 +1,19 @@
-#!/usr/bin/env python
+#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
 #
-# Copyright 2016 Red Hat, Inc.
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
 #
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
 
-from setuptools import setup
+import setuptools
 
-setup(
-    name='novajoin',
-    version='1.0.6',
-
-    description='Nova integration to enroll IPA clients',
-
-    author='Rob Crittenden',
-    author_email='rcritten@redhat.com',
-
-    url='https://github.com/rcritten/novajoin.git',
-
-    classifiers=['Development Status :: 3 - Alpha',
-                 'License :: OSI Approved :: Apache Software License',
-                 'Programming Language :: Python',
-                 'Programming Language :: Python :: 2',
-                 'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.4',
-                 'Intended Audience :: Developers',
-                 'Environment :: Console',
-                 ],
-
-    license="Apache License, Version 2.0",
-
-    platforms=['Any'],
-
-    packages=['novajoin'],
-
-    data_files=[('/usr/share/novajoin', ['files/cloud-config.json',
-                                         'files/freeipa.json',
-                                         'files/join.conf.template',
-                                         ],),
-                ('/etc/join', ['files/api-paste.ini'],),
-                ('/usr/sbin', ['scripts/novajoin-notify'],),
-                ('/usr/sbin', ['scripts/novajoin-server'],),
-                ('/usr/sbin', ['scripts/novajoin-install'],),
-                ('/usr/libexec', ['scripts/novajoin-ipa-setup']),
-                ('/usr/share/man/man1', ['man/novajoin-install.1',
-                                         'man/novajoin-notify.1',
-                                         'man/novajoin-server.1',
-                                         ]),
-                ],
-
-    zip_safe=False,
-)
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)