deleted file mode 100644

@@ -1,25 +0,0 @@

-diff -rup cloud-init-0.7.9/requirements.txt cloud-init-0.7.9-new/requirements.txt

-+++ cloud-init-0.7.9-new/requirements.txt	2017-05-02 15:07:06.335777515 -0700

-@@ -27,9 +27,6 @@ configobj>=5.0.2

- # All new style configurations are in the yaml format

- pyyaml

- 

--# The new main entrypoint uses argparse instead of optparse

--argparse

--

- # Requests handles ssl correctly!

- requests

- 

-diff -rup cloud-init-0.7.9/setup.py cloud-init-0.7.9-new/setup.py

-+++ cloud-init-0.7.9-new/setup.py	2017-05-02 15:07:20.483777195 -0700

-@@ -185,8 +185,6 @@ else:

- 

- 

- requirements = read_requires()

--if sys.version_info < (3,):

--    requirements.append('cheetah')

- 

- setuptools.setup(

-     name='cloud-init',

@@ -1,89 +1,39 @@

-diff -rup cloud-init-0.7.9/cloudinit/sources/DataSourceAzure.py cloud-init-0.7.9-1/cloudinit/sources/DataSourceAzure.py

-+++ cloud-init-0.7.9-1/cloudinit/sources/DataSourceAzure.py	2018-02-20 01:21:12.844575653 -0800

-@@ -23,12 +23,18 @@ LOG = logging.getLogger(__name__)

+diff -rup cloud-init-18.3/cloudinit/sources/DataSourceAzure.py cloud-init-18.3-new/cloudinit/sources/DataSourceAzure.py

+--- cloud-init-18.3/cloudinit/sources/DataSourceAzure.py	2018-06-20 05:49:26.000000000 +0530

+@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)

  DS_NAME = 'Azure'

  DEFAULT_METADATA = {"instance-id": "iid-AZURE-NODE"}

 -AGENT_START = ['service', 'walinuxagent', 'start']

 +AGENT_START = ['systemctl', 'start', 'waagent']

  AGENT_START_BUILTIN = "__builtin__"

- BOUNCE_COMMAND = [

+ BOUNCE_COMMAND_IFUP = [

      'sh', '-xc',

-     "i=$interface; x=0; ifdown $i || x=$?; ifup $i || x=$?; exit $x"

- ]

-+

-+BOUNCE_COMMAND_PHOTON = [

-+    'sh', '-xc',

-+    ("i=$interface; x=0; ifconfig $i down || x=$?; "

-+     "ifconfig $i up || x=$?; exit $x")

-+]

- # azure systems will always have a resource disk, and 66-azure-ephemeral.rules

- # ensures that it gets linked to this path.

- RESOURCE_DISK_PATH = '/dev/disk/cloud/azure_resource'

-@@ -40,7 +46,7 @@ BUILTIN_DS_CONFIG = {

-     'hostname_bounce': {

-         'interface': 'eth0',

-         'policy': True,

--        'command': BOUNCE_COMMAND,

-+        'command': 'builtin',

-         'hostname_command': 'hostname',

-     },

-     'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH},

-@@ -154,7 +160,7 @@ class DataSourceAzureNet(sources.DataSou

- 

-             missing = util.log_time(logfunc=LOG.debug, msg="waiting for files",

-                                     func=wait_for_files,

--                                    args=(fp_files,))

-+                                    args=(fp_files,180))

-         if len(missing):

-             LOG.warn("Did not find files, but going on: %s", missing)

- 

-@@ -362,7 +368,9 @@ def perform_hostname_bounce(hostname, cf

-     env['old_hostname'] = prev_hostname

- 

-     if command == "builtin":

--        command = BOUNCE_COMMAND

-+        LOG.debug(

-+                "Skipping network bounce: ifupdown utils aren't present.")

-+        return

- 

-     LOG.debug("pubhname: publishing hostname [%s]", msg)

-     shell = not isinstance(command, (list, tuple))

-@@ -396,7 +404,7 @@ def pubkeys_from_crt_files(flist):

-     return pubkeys

- 

- 

--def wait_for_files(flist, maxwait=60, naplen=.5, log_pre=""):

-+def wait_for_files(flist, maxwait, naplen=.5, log_pre=""):

-     need = set(flist)

-     waited = 0

-     while True:

- 

-diff -rup cloud-init-0.7.9/cloudinit/sources/helpers/azure.py cloud-init-0.7.9-1/cloudinit/sources/helpers/azure.py

-+++ cloud-init-0.7.9-1/cloudinit/sources/helpers/azure.py	2018-02-20 01:13:25.885641372 -0800

-@@ -8,16 +8,18 @@ import socket

+diff -rup cloud-init-18.3/cloudinit/sources/helpers/azure.py cloud-init-18.3-new/cloudinit/sources/helpers/azure.py

+--- cloud-init-18.3/cloudinit/sources/helpers/azure.py	2018-06-20 05:49:26.000000000 +0530

+@@ -7,6 +7,7 @@ import re

+ import socket

  import struct

- import tempfile

  import time

 +import configobj

+ from cloudinit.net import dhcp

  from cloudinit import stages

- from contextlib import contextmanager

- from xml.etree import ElementTree

+@@ -16,9 +17,10 @@ from xml.etree import ElementTree

+ from cloudinit import url_helper

  from cloudinit import util

 +from io import StringIO

- 

  LOG = logging.getLogger(__name__)

 -

 +NETWORKD_LEASES_DIR = '/run/systemd/netif/leases'

  @contextmanager

  def cd(newdir):

-@@ -264,6 +266,32 @@ class WALinuxAgentShim(object):

+@@ -281,6 +283,32 @@ class WALinuxAgentShim(object):

          return dhcp_options

      @staticmethod

@@ -116,34 +66,15 @@ diff -rup cloud-init-0.7.9/cloudinit/sources/helpers/azure.py cloud-init-0.7.9-1

      def _get_value_from_dhcpoptions(dhcp_options):

          if dhcp_options is None:

              return None

-@@ -277,13 +305,28 @@ class WALinuxAgentShim(object):

-         return _value

- 

-     @staticmethod

-+    def networkd_get_option_from_leases(keyname, leases_d=None):

-+        if leases_d is None:

-+            leases_d = NETWORKD_LEASES_DIR

-+        leases = WALinuxAgentShim.networkd_load_leases(leases_d=leases_d)

-+        for ifindex, data in sorted(leases.items()):

-+            if data.get(keyname):

-+                return data[keyname]

-+        return None

-+

-+    @staticmethod

-+    def _networkd_get_value_from_leases(leases_d=None):

-+        return WALinuxAgentShim.networkd_get_option_from_leases(

-+            'OPTION_245', leases_d=leases_d)

+@@ -306,8 +334,9 @@ class WALinuxAgentShim(object):

+             # Option-245 stored in /run/cloud-init/dhclient.hooks/<ifc>.json

+             # a dhclient exit hook that calls cloud-init-dhclient-hook

+             LOG.debug('Finding Azure endpoint from hook json...')

+-            dhcp_options = WALinuxAgentShim._load_dhclient_json()

+-            value = WALinuxAgentShim._get_value_from_dhcpoptions(dhcp_options)

++            value = WALinuxAgentShim._networkd_get_value_from_leases()

++            LOG.debug('networkd value from lease %s', value)

 +

-+    @staticmethod

-     def find_endpoint(fallback_lease_file=None):

-         LOG.debug('Finding Azure endpoint...')

-         value = None

-         # Option-245 stored in /run/cloud-init/dhclient.hooks/<ifc>.json

-         # a dhclient exit hook that calls cloud-init-dhclient-hook

--        dhcp_options = WALinuxAgentShim._load_dhclient_json()

--        value = WALinuxAgentShim._get_value_from_dhcpoptions(dhcp_options)

-+        value = WALinuxAgentShim._networkd_get_value_from_leases()

-+        LOG.debug('networkd value from lease %s', value)

          if value is None:

              # Fallback and check the leases file if unsuccessful

              LOG.debug("Unable to find endpoint in dhclient logs. "

@@ -1,8 +1,8 @@

 %define python3_sitelib /usr/lib/python3.7/site-packages

 Name:           cloud-init

-Version:        0.7.9

-Release:        15%{?dist}

+Version:        18.3

+Release:        1%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -10,15 +10,13 @@ URL:            http://launchpad.net/cloud-init

 Vendor:         VMware, Inc

 Distribution:   Photon

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

-%define sha1 cloud-init=3b4345267e72e28b877e2e3f0735c1f672674cfc

+%define sha1 cloud-init=a317e2add93578d244328dcf97d46fad1c3140f9

 Source1:        cloud-photon.cfg

 Source2:        99-disable-networking-config.cfg

 Patch0:         photon-distro.patch

-Patch1:         change-requires.patch

 Patch2:         vca-admin-pwd.patch

 Patch3:         photon-hosts-template.patch

-Patch4:         resizePartitionUUID.patch

 Patch5:         datasource-guestinfo.patch

 Patch6:         systemd-service-changes.patch

 Patch7:         makecheck.patch

@@ -34,6 +32,16 @@ BuildRequires:  iproute2

 BuildRequires:  automake

 BuildRequires:  python3-setuptools

 BuildRequires:  python3-xml

+BuildRequires:  python3-six

+# %if %{with_check}

+BuildRequires:  python3-requests

+# %endif

+BuildRequires:  python3-PyYAML

+BuildRequires:  python3-urllib3

+BuildRequires:  python3-chardet

+BuildRequires:  python3-certifi

+BuildRequires:  python3-idna

+BuildRequires:  python3-jinja2

 Requires:       systemd

 Requires:       (net-tools or toybox)

@@ -50,6 +58,7 @@ Requires:       python3-markupsafe

 Requires:       python3-six

 Requires:       python3-setuptools

 Requires:       python3-xml

+Requires:       python3-jsonschema

 BuildArch:      noarch

 %description

@@ -61,17 +70,15 @@ ssh keys and to let the user run various scripts.

 %prep

 %setup -q -n %{name}-%{version}

 %patch0 -p1

-%patch1 -p1

 %patch2 -p1

 %patch3 -p1

-%patch4 -p1

 %patch5 -p1

 %patch6 -p1

 %patch7 -p1

 %patch8 -p1

 %patch9 -p1

-find systemd -name cloud*.service | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

+find systemd -name "cloud*.service*" | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

 %build

 python3 setup.py build

@@ -80,9 +87,6 @@ python3 setup.py build

 rm -rf $RPM_BUILD_ROOT

 python3 setup.py install -O1 --skip-build --root=%{buildroot} --init-system systemd

-# Don't ship the tests

-rm -r %{buildroot}%{python3_sitelib}/tests

-

 mkdir -p %{buildroot}/var/lib/cloud

 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

@@ -132,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT

 /lib/systemd/system-generators/cloud-init-generator

 /lib/udev/rules.d/66-azure-ephemeral.rules

 /lib/systemd/system/*

+/etc/bash_completion.d/cloud-init

 %{_docdir}/cloud-init/*

 %{_libdir}/cloud-init/*

 %{python3_sitelib}/*

@@ -140,6 +145,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Wed Oct 24 2018 Ajay Kaher <akaher@vmware.com> 18.3-1

+-   Upgraded version to 18.3

 *   Sun Oct 07 2018 Tapas Kundu <tkundu@vmware.com> 0.7.9-15

 -   Updated using python 3.7 lib

 *   Wed Feb 28 2018 Anish Swaminathan <anishs@vmware.com> 0.7.9-14

@@ -1,6 +1,7 @@

-+++ b/tests/unittests/test_distros/test_create_users.py 2017-08-22 18:22:58.046399977 +0000

-@@ -103,10 +103,10 @@

+diff -rup cloud-init-18.3/tests/unittests/test_distros/test_create_users.py cloud-init-18.3-new/tests/unittests/test_distros/test_create_users.py

+--- cloud-init-18.3/tests/unittests/test_distros/test_create_users.py	2018-06-20 05:49:26.000000000 +0530

+@@ -102,10 +102,10 @@ class TestCreateUser(TestCase):

          user = 'foouser'

          password = 'passfoo'

          self.dist.create_user(user, passwd=password)

@@ -8,23 +9,24 @@

 -            m_subp.call_args_list,

 -            [self._useradd2call([user, '--password', password, '-m']),

 -             mock.call(['passwd', '-l', user])])

-+        #self.assertEqual(

-+        #    m_subp.call_args_list,

-+        #    [self._useradd2call([user, '--password', password, '-m']),

++        # self.assertEqual(

++        #     m_subp.call_args_list,

++        #     [self._useradd2call([user, '--password', password, '-m']),

 +        #     mock.call(['passwd', '-l', user])])

-

+ 

      @mock.patch("cloudinit.distros.util.is_group")

-     @mock.patch("cloudinit.distros.util.subp")

-+++ b/tests/unittests/test_util.py      2017-08-22 18:13:04.494421204 +0000

-@@ -568,8 +568,8 @@

-         data = b'hello world'

+     def test_group_added(self, m_is_group, m_subp, m_is_snappy):

+diff -rup cloud-init-18.3/tests/unittests/test_util.py cloud-init-18.3-new/tests/unittests/test_util.py

+--- cloud-init-18.3/tests/unittests/test_util.py	2018-06-20 05:49:26.000000000 +0530

+@@ -816,8 +816,8 @@ class TestSubp(helpers.CiTestCase):

          (out, err) = util.subp(self.stdin2err, capture=True,

-                                decode=False, data=data)

+                                decode=False, data=data,

+                                update_env={'LC_ALL': 'C'})

 -        self.assertEqual(err, data)

 -        self.assertEqual(out, b'')

-+        #self.assertEqual(err, data)

-+        #self.assertEqual(out, b'')

-

++        # self.assertEqual(err, data)

++        # self.assertEqual(out, b'')

+ 

      def test_subp_reads_env(self):

          with mock.patch.dict("os.environ", values={'FOO': 'BAR'}):

deleted file mode 100755

@@ -1,102 +0,0 @@

-diff -rup cloud-init-0.7.9/cloudinit/config/cc_growpart.py cloud-init-0.7.9-new/cloudinit/config/cc_growpart.py

-+++ cloud-init-0.7.9-new/cloudinit/config/cc_growpart.py	2017-04-28 17:55:53.083355910 -0700

-@@ -247,7 +247,20 @@ def devent2dev(devent):

-         result = util.get_mount_info(devent)

-         if not result:

-             raise ValueError("Could not determine device of '%s' % dev_ent")

--        return result[0]

-+        dev = result[0]

-+

-+    container = util.is_container()

-+

-+    # Ensure the path is a block device.

-+    if (dev == "/dev/root" and not container):

-+        dev = util.rootdev_from_cmdline(util.get_cmdline())

-+        if dev is None:

-+            if os.path.exists(dev):

-+                # if /dev/root exists, but we failed to convert

-+                # that to a "real" /dev/ path device, then return it.

-+                return dev

-+            raise ValueError("Unable to find device '/dev/root'")

-+    return dev

- 

- 

- def resize_devices(resizer, devices):

-diff -rup cloud-init-0.7.9/cloudinit/config/cc_resizefs.py cloud-init-0.7.9-new/cloudinit/config/cc_resizefs.py

-+++ cloud-init-0.7.9-new/cloudinit/config/cc_resizefs.py	2017-04-28 17:55:33.095356361 -0700

-@@ -71,25 +71,6 @@ RESIZE_FS_PREFIXES_CMDS = [

- NOBLOCK = "noblock"

- 

- 

--def rootdev_from_cmdline(cmdline):

--    found = None

--    for tok in cmdline.split():

--        if tok.startswith("root="):

--            found = tok[5:]

--            break

--    if found is None:

--        return None

--

--    if found.startswith("/dev/"):

--        return found

--    if found.startswith("LABEL="):

--        return "/dev/disk/by-label/" + found[len("LABEL="):]

--    if found.startswith("UUID="):

--        return "/dev/disk/by-uuid/" + found[len("UUID="):]

--

--    return "/dev/" + found

--

--

- def handle(name, cfg, _cloud, log, args):

-     if len(args) != 0:

-         resize_root = args[0]

-@@ -121,7 +102,7 @@ def handle(name, cfg, _cloud, log, args)

-     # Ensure the path is a block device.

-     if (devpth == "/dev/root" and not os.path.exists(devpth) and

-             not container):

--        devpth = rootdev_from_cmdline(util.get_cmdline())

-+        devpth = util.rootdev_from_cmdline(util.get_cmdline())

-         if devpth is None:

-             log.warn("Unable to find device '/dev/root'")

-             return

-diff -rup cloud-init-0.7.9/cloudinit/util.py cloud-init-0.7.9-new/cloudinit/util.py

-+++ cloud-init-0.7.9-new/cloudinit/util.py	2017-04-28 17:55:57.435355811 -0700

-@@ -2402,4 +2402,34 @@ def system_is_snappy():

-         return True

-     return False

- 

-+def rootdev_from_cmdline(cmdline):

-+    found = None

-+    for tok in cmdline.split():

-+        if tok.startswith("root="):

-+            found = tok[5:]

-+            break

-+    if found is None:

-+        return None

-+

-+    if found.startswith("/dev/"):

-+        return found

-+    if found.startswith("LABEL="):

-+        return "/dev/disk/by-label/" + found[len("LABEL="):]

-+    if found.startswith("UUID="):

-+        return "/dev/disk/by-uuid/" + found[len("UUID="):].lower()

-+    if found.startswith("PARTUUID="):

-+        disks_path = ("/dev/disk/by-partuuid/" +

-+                      found[len("PARTUUID="):].lower())

-+        if os.path.exists(disks_path):

-+            return disks_path

-+        results = find_devs_with(found)

-+        if results:

-+            return results[0]

-+        # we know this doesn't exist, but for consistency return the path as

-+        # it /would/ exist

-+        return disks_path

-+

-+    return "/dev/" + found

-+

-+

- # vi: ts=4 expandtab

-

@@ -1,12 +1,12 @@

-diff -uNr cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py cloud-init-0.7.9/cloudinit/config/cc_resolv_conf.py

-+++ cloud-init-0.7.9/cloudinit/config/cc_resolv_conf.py	2017-10-17 22:46:50.411709013 +0000

+diff -uNr cloud-init-18.3/cloudinit/config/cc_resolv_conf.py cloud-init-18.3-new/cloudinit/config/cc_resolv_conf.py

+--- cloud-init-18.3/cloudinit/config/cc_resolv_conf.py	2018-06-20 05:49:26.000000000 +0530

 @@ -55,10 +55,10 @@

  frequency = PER_INSTANCE

--distros = ['fedora', 'rhel', 'sles']

-+distros = ['fedora', 'rhel', 'sles', 'photon']

+-distros = ['fedora', 'opensuse', 'rhel', 'sles']

++distros = ['fedora', 'opensuse', 'rhel', 'sles', 'photon']

 -def generate_resolv_conf(template_fn, params, target_fname="/etc/resolv.conf"):

@@ -30,9 +30,9 @@ diff -uNr cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py cloud-init-0.

      return

  # vi: ts=4 expandtab

-diff -uNr cloud-init-0.7.9-orig/templates/systemd.resolved.conf.tmpl cloud-init-0.7.9/templates/systemd.resolved.conf.tmpl

-+++ cloud-init-0.7.9/templates/systemd.resolved.conf.tmpl	2017-10-17 21:35:37.291505255 +0000

+diff -uNr cloud-init-18.3/templates/systemd.resolved.conf.tmpl cloud-init-18.3-new/templates/systemd.resolved.conf.tmpl

+--- cloud-init-18.3/templates/systemd.resolved.conf.tmpl	1970-01-01 05:30:00.000000000 +0530

 @@ -0,0 +1,15 @@

 +## template:jinja

 +# Your system has been configured with 'manage-resolv-conf' set to true.

@@ -1,32 +1,28 @@

-diff -rup cloud-init-0.7.9/systemd/cloud-final.service cloud-init-0.7.9-new/systemd/cloud-final.service

-+++ cloud-init-0.7.9-new/systemd/cloud-final.service	2017-04-28 15:25:39.195559535 -0700

-@@ -1,6 +1,6 @@

- [Unit]

- Description=Execute cloud user/final scripts

--After=network-online.target cloud-config.service rc-local.service multi-user.target

-+After=network-online.target cloud-config.service rc-local.service

- Wants=network-online.target cloud-config.service

- 

- [Service]

-diff -rup cloud-init-0.7.9/systemd/cloud-init.service cloud-init-0.7.9-new/systemd/cloud-init.service

-+++ cloud-init-0.7.9-new/systemd/cloud-init.service	2017-04-28 15:26:05.703558936 -0700

-@@ -1,6 +1,5 @@

+diff -rup cloud-init-18.3/systemd/cloud-init.service.tmpl cloud-init-18.3-new/systemd/cloud-init.service.tmpl

+--- cloud-init-18.3/systemd/cloud-init.service.tmpl	2018-06-20 05:49:26.000000000 +0530

+@@ -1,7 +1,6 @@

+ ## template:jinja

  [Unit]

  Description=Initial cloud-init job (metadata service crawler)

 -DefaultDependencies=no

  Wants=cloud-init-local.service

  Wants=sshd-keygen.service

  Wants=sshd.service

-@@ -9,9 +8,8 @@ After=networking.service

+@@ -21,15 +20,9 @@ After=wicked.service

+ After=dbus.service

+ {% endif %}

  Before=network-online.target

 +After=systemd-networkd-wait-online.service

  Before=sshd-keygen.service

  Before=sshd.service

+-{% if variant in ["ubuntu", "unknown", "debian"] %}

 -Before=sysinit.target

- Before=systemd-user-sessions.service

 -Conflicts=shutdown.target

+-{% endif %}

+-{% if variant in ["suse"] %}

+-Conflicts=shutdown.target

+-{% endif %}

+ Before=systemd-user-sessions.service

  [Service]

- Type=oneshot

new file mode 100644

@@ -0,0 +1,71 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+Name:           python-jsonschema

+Version:        2.6.0

+Release:        1%{?dist}

+Summary:        An implementation of JSON Schema validation for Python

+License:        MIT

+Group:          Development/Languages/Python

+Url:		http://pypi.python.org/pypi/jsonschema

+Source0:        http://pypi.python.org/packages/source/j/jsonschema/jsonschema-%{version}.tar.gz

+%define sha1    jsonschema=97e49df4601f7066d9954c0ec4d8d697887b32f0

+

+BuildRequires: python2

+BuildRequires: python2-libs

+BuildRequires: python-setuptools

+BuildRequires: python-vcversioner

+

+BuildArch:      noarch

+

+%description

+jsonschema is JSON Schema validator currently based on

+http://tools.ietf.org/html/draft-zyp-json-schema-03

+

+%package -n     python3-jsonschema

+Summary:        python-jsonschema

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  python3-setuptools

+BuildRequires:  python3-xml

+BuildRequires:  python3-vcversioner

+

+%description -n python3-jsonschema

+

+%prep

+%setup -n jsonschema-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

+

+%build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

+

+%install

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

+mv %{buildroot}/%{_bindir}/jsonschema %{buildroot}/%{_bindir}/jsonschema3

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+

+%check

+python2 setup.py test

+pushd ../p3dir

+python3 setup test

+popd

+

+%files

+%defattr(-,root,root,-)

+%{python2_sitelib}/*

+%{_bindir}/jsonschema

+

+%files -n python3-jsonschema

+%defattr(-,root,root)

+%{python3_sitelib}/*

+%{_bindir}/jsonschema3

+

+%changelog

+*   Tue Oct 23 2018 Sujay G <gsujay@vmware.com> 2.6.0-1

+-   Initial version

new file mode 100644

@@ -0,0 +1,66 @@

+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+%{!?python3_sitelib: %define python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}

+

+Name:           python-vcversioner

+Version:        2.16.0.0

+Release:        1%{?dist}

+Summary:        Python version extractor

+License:        ISC

+Group:          Development/Languages/Python

+Url:		https://github.com/habnabit/vcversioner

+Source0:        vcversioner-%{version}.tar.gz

+%define sha1    vcversioner=ce076b62e8f0772bf79f29762bfc3cf09f6781b5

+

+BuildRequires: python2

+#BuildRequires: python2-libs

+BuildRequires: python-setuptools

+

+BuildArch:      noarch

+

+%description

+Elevator pitch: you can write a setup.py with no version information specified, and vcversioner will find a recent, properly-formatted VCS tag and extract a version from it.

+

+%package -n     python3-vcversioner

+Summary:        python-vcversioner

+BuildRequires:  python3-devel

+BuildRequires:  python3-libs

+BuildRequires:  python3-setuptools

+BuildRequires:  python3-xml

+

+%description -n python3-vcversioner

+Python 3 version.

+

+%prep

+%setup -n vcversioner-%{version}

+rm -rf ../p3dir

+cp -a . ../p3dir

+

+%build

+python2 setup.py build

+pushd ../p3dir

+python3 setup.py build

+popd

+

+%install

+pushd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+popd

+python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+

+%check

+python2 setup.py test

+pushd ../p3dir

+python3 setup test

+popd

+

+%files

+%defattr(-,root,root,-)

+%{python2_sitelib}/*

+

+%files -n python3-vcversioner

+%defattr(-,root,root)

+%{python3_sitelib}/*

+

+%changelog

+*   Tue Oct 23 2018 Sujay G <gsujay@vmware.com> 2.16.0.0-1

+-   Initial version