Packaging fixup in preparation for 1.1 release cycle

Fix email addresses, fold common into client, add pyparsing dependency.

confluent_client/VERSION

@@ -1 +1 @@
-1.0
+1.1

confluent_client/confluent_client.spec.tmpl

@@ -12,9 +12,9 @@ Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 BuildArch: noarch
-Vendor: Jarrod Johnson <jbjohnso@us.ibm.com>
+Vendor: Jarrod Johnson <jjohnson2@lenovo.com>
 Url: http://xcat.sf.net/
-Requires: confluent_common
+Obsoletes: confluent_common
 
 %description
 This package enables python development and command line access to
@@ -27,11 +27,7 @@ a confluent server.
 python setup.py build
 
 %install
-python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES.bare --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
-for file in $(grep confluent/__init__.py INSTALLED_FILES.bare); do
-    rm $RPM_BUILD_ROOT/$file
-done
-grep -v confluent/__init__.py INSTALLED_FILES.bare > INSTALLED_FILES
+python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
 
 
 %clean

confluent_client/requirements.txt

@@ -1 +0,0 @@
-confluent_common>=0.1

confluent_client/setup.py.tmpl

@@ -4,9 +4,8 @@ setup(
     name='confluent_client',
     version='#VERSION#',
     author='Jarrod Johnson',
-    author_email='jbjohnso@us.ibm.com',
+    author_email='jjohnson2@lenovo.com',
     url='http://xcat.sf.net/',
     packages=['confluent'],
-    install_requires=['confluent_common>=0.1.0'],
-    scripts=['bin/confetty'],
+    scripts=['bin/confetty', 'bin/nodehealth', 'bin/nodeidentify', 'bin/nodepower', 'bin/nodesensors', 'bin/nodesetboot'],
 )

confluent_common/README.txt

@@ -1,7 +1 @@
-================
-confluent_common
-================
-
-confluent_common are the python modules used by both
-confluent_server and confluent_client.  Installation
-of this without client or server does not make sense.
+The contents of this package have been moved into confluent_client

confluent_common/VERSION

@@ -1 +1 @@
-1.0
+1.0.1

confluent_common/setup.cfg

@@ -4,7 +4,7 @@ summary = Confluent Common Libraries
 description-file =
     README.txt
 author = Jarrod Johnson
-author-email = jbjohnso@us.ibm.com
+author-email = jjohnson2@lenovo.com
 home-page = http://xcat.sf.net/
 classifier =
     Intended Audience :: Information Technology
@@ -15,5 +15,3 @@ classifier =
     Programming Language :: Python :: 2.7
 
 [files]
-packages =
-    confluent

confluent_common/setup.py.tmpl

@@ -4,8 +4,7 @@ setup(
     name='confluent_common',
     version='#VERSION#',
     author='Jarrod Johnson',
-    author_email='jbjohnso@us.ibm.com',
+    author_email='jjohnson2@lenovo.com',
     description='common content for confluent client and server',
     url='http://xcat.sf.net/',
-    packages=['confluent'],
     )

confluent_server/VERSION

@@ -1 +1 @@
-1.0.1
+1.1

confluent_server/confluent_server.spec.tmpl

@@ -12,8 +12,8 @@ Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 BuildArch: noarch
-Requires: pyghmi, eventlet, greenlet, confluent_common, pycrypto >= 2.6.1, confluent_client, PyPAM
-Vendor: Jarrod Johnson <jbjohnso@us.ibm.com>
+Requires: pyghmi, eventlet, greenlet, pycrypto >= 2.6.1, confluent_client, PyPAM, pyparsing
+Vendor: Jarrod Johnson <jjohnson2@lenovo.com>
 Url: http://xcat.sf.net/
 
 %description

confluent_server/requirements.txt

@@ -1,2 +1,3 @@
 confluent_client>=0.1
 pycrypto>=2.6
+pyparsing