From b7dfe2028693d14896fcf219471e1b7992d4652d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 30 Sep 2022 10:43:18 -0400 Subject: [PATCH] Add legal artifacts to confluent_server --- confluent_client/COPYRIGHT | 42 ++++++++++----------- confluent_server/COPYRIGHT | 21 +++++++++++ confluent_server/confluent_server.spec.tmpl | 4 +- confluent_server/setup.py.tmpl | 9 +++-- 4 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 confluent_server/COPYRIGHT diff --git a/confluent_client/COPYRIGHT b/confluent_client/COPYRIGHT index da775ec8..6bcd9986 100644 --- a/confluent_client/COPYRIGHT +++ b/confluent_client/COPYRIGHT @@ -1,21 +1,21 @@ -Name: confluent-client -Project: https://hpc.lenovo.com/users/ -Source: https://github.com/lenovo/confluent - -Files: * -Copyright: 2014-2019 Lenovo -License: Apache-2.0 - -File: client.py: -Copyright: 2014 IBM Corporation - 2015-2019 Lenovo -License: Apache-2.0 - -File: sortutil.py -Copyright: 2014 IBM Corporation - 2015-2016 Lenovo -License: Apache-2.0 - -File: tlv.py -Copyright: 2014 IBM Corporation -License: Apache-2.0 +Name: confluent-client +Project: https://hpc.lenovo.com/users/ +Source: https://github.com/lenovo/confluent + +Files: * +Copyright: 2014-2019 Lenovo +License: Apache-2.0 + +File: client.py: +Copyright: 2014 IBM Corporation + 2015-2019 Lenovo +License: Apache-2.0 + +File: sortutil.py +Copyright: 2014 IBM Corporation + 2015-2016 Lenovo +License: Apache-2.0 + +File: tlv.py +Copyright: 2014 IBM Corporation +License: Apache-2.0 diff --git a/confluent_server/COPYRIGHT b/confluent_server/COPYRIGHT new file mode 100644 index 00000000..6bcd9986 --- /dev/null +++ b/confluent_server/COPYRIGHT @@ -0,0 +1,21 @@ +Name: confluent-client +Project: https://hpc.lenovo.com/users/ +Source: https://github.com/lenovo/confluent + +Files: * +Copyright: 2014-2019 Lenovo +License: Apache-2.0 + +File: client.py: +Copyright: 2014 IBM Corporation + 2015-2019 Lenovo +License: Apache-2.0 + +File: sortutil.py +Copyright: 2014 IBM Corporation + 2015-2016 Lenovo +License: Apache-2.0 + +File: tlv.py +Copyright: 2014 IBM Corporation +License: Apache-2.0 diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index 3da9f08d..31cc6603 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -26,8 +26,8 @@ Requires: python3-pyghmi >= 1.0.34, python3-eventlet, python3-greenlet, python3- %endif %endif %endif -Vendor: Jarrod Johnson -Url: http://xcat.sf.net/ +Vendor: Lenovo +Url: https://github.com/lenovo/confluent %description Server for console management and systems management aggregation diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index b13a7b8e..e6bd08b2 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -4,10 +4,13 @@ import os setup( name='confluent_server', version='#VERSION#', - author='Jarrod Johnson', + author='Lenovo', author_email='jjohnson2@lenovo.com', - url='http://xcat.sf.net/', + url='https://github.com/lenovo/confluent/', + license='Apache-2.0', description='confluent systems management server', + long_description='confluent systems management server', + platforms=['Linux'], packages=['confluent', 'confluent/config', 'confluent/interface', 'confluent/discovery/', 'confluent/discovery/protocols/', @@ -25,7 +28,7 @@ setup( scripts=['bin/confluent', 'bin/confluent_selfcheck', 'bin/confluentdbutil', 'bin/collective', 'bin/osdeploy'], data_files=[('/etc/init.d', ['sysvinit/confluent']), ('/usr/lib/sysctl.d', ['sysctl/confluent.conf']), - ('/opt/confluent/share/licenses/confluent_server', ['LICENSE']), + ('/opt/confluent/share/licenses/confluent_server', ['LICENSE', 'COPYRIGHT']), ('/usr/lib/systemd/system', ['systemd/confluent.service']), ('/opt/confluent/lib/python/confluent/plugins/console/', [])],