diff --git a/confluent_client/VERSION b/confluent_client/VERSION index d3827e75..9459d4ba 100644 --- a/confluent_client/VERSION +++ b/confluent_client/VERSION @@ -1 +1 @@ -1.0 +1.1 diff --git a/confluent_common/confluent/tlv.py b/confluent_client/confluent/tlv.py similarity index 100% rename from confluent_common/confluent/tlv.py rename to confluent_client/confluent/tlv.py diff --git a/confluent_common/confluent/tlvdata.py b/confluent_client/confluent/tlvdata.py similarity index 100% rename from confluent_common/confluent/tlvdata.py rename to confluent_client/confluent/tlvdata.py diff --git a/confluent_client/confluent_client.spec.tmpl b/confluent_client/confluent_client.spec.tmpl index 9b873688..5317b0c6 100644 --- a/confluent_client/confluent_client.spec.tmpl +++ b/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 +Vendor: Jarrod Johnson 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 diff --git a/confluent_client/requirements.txt b/confluent_client/requirements.txt index e57912ee..e69de29b 100644 --- a/confluent_client/requirements.txt +++ b/confluent_client/requirements.txt @@ -1 +0,0 @@ -confluent_common>=0.1 diff --git a/confluent_client/setup.py.tmpl b/confluent_client/setup.py.tmpl index c0e9b322..0eb69827 100644 --- a/confluent_client/setup.py.tmpl +++ b/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'], ) diff --git a/confluent_common/README.txt b/confluent_common/README.txt index 93b60e19..31c16aae 100644 --- a/confluent_common/README.txt +++ b/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 diff --git a/confluent_common/VERSION b/confluent_common/VERSION index d3827e75..7dea76ed 100644 --- a/confluent_common/VERSION +++ b/confluent_common/VERSION @@ -1 +1 @@ -1.0 +1.0.1 diff --git a/confluent_common/confluent/__init__.py b/confluent_common/confluent/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/confluent_common/setup.cfg b/confluent_common/setup.cfg index de45e04b..88bee033 100644 --- a/confluent_common/setup.cfg +++ b/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 diff --git a/confluent_common/setup.py.tmpl b/confluent_common/setup.py.tmpl index d378076a..0c8d545b 100644 --- a/confluent_common/setup.py.tmpl +++ b/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'], ) diff --git a/confluent_server/VERSION b/confluent_server/VERSION index 7dea76ed..9459d4ba 100644 --- a/confluent_server/VERSION +++ b/confluent_server/VERSION @@ -1 +1 @@ -1.0.1 +1.1 diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index ae721adf..b9580269 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/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 +Requires: pyghmi, eventlet, greenlet, pycrypto >= 2.6.1, confluent_client, PyPAM, pyparsing +Vendor: Jarrod Johnson Url: http://xcat.sf.net/ %description diff --git a/confluent_server/requirements.txt b/confluent_server/requirements.txt index 753e5d39..d0be6908 100644 --- a/confluent_server/requirements.txt +++ b/confluent_server/requirements.txt @@ -1,2 +1,3 @@ confluent_client>=0.1 pycrypto>=2.6 +pyparsing