From 58a16e56884dcc8a662ba18bcb3b03c34600d46f Mon Sep 17 00:00:00 2001
From: soksanichenko <soksanichenko@cloudlinux.com>
Date: Mon, 20 Dec 2021 13:53:21 +0200
Subject: [PATCH] - The version is bumped - The changelog is updated - The test
 `create_packages_json` is fixed

@BS-NOBUILD
@BS-TARGET-CL8

Change-Id: I173013da990eb296e58ca8f3555a05913ca1c852
---
 pungi.spec                         | 5 ++++-
 setup.py                           | 2 +-
 tests/test_create_packages_json.py | 9 +++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pungi.spec b/pungi.spec
index 79ee517a..542d1372 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           pungi
-Version:        4.2.13
+Version:        4.2.14
 Release:        1%{?dist}.cloudlinux
 Summary:        Distribution compose tool
 
@@ -160,6 +160,9 @@ python3 -m pytest
 
 
 %changelog
+* Mon Dec 20 2021 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.14-1
+- ALBS-66: The generator of packages JSON can process the same packages with different versions
+
 * Fri Jun 18 2021 stepan_oksanichenko <soksanichenko@cloudlinux.com> - 4.2.13-1
 - LNX-326: Add the ability to include any package by mask in packages.json to the generator
 - LNX-318: Modify build scripts for building CloudLinux OS 8.4
diff --git a/setup.py b/setup.py
index 7e2d7776..fc34c45b 100755
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ packages = sorted(packages)
 
 setup(
     name="pungi",
-    version="4.2.13",
+    version="4.2.14",
     description="Distribution compose tool",
     url="https://pagure.io/pungi",
     author="Dennis Gilmore",
diff --git a/tests/test_create_packages_json.py b/tests/test_create_packages_json.py
index 122fd870..746782a8 100644
--- a/tests/test_create_packages_json.py
+++ b/tests/test_create_packages_json.py
@@ -75,18 +75,19 @@ class TestPackagesJson(TestCase):
                 )
             )
         )
-        test_packages['TestRepo']['x86_64']['zziplib'] = \
-            [
-                'zziplib.x86_64',
-            ]
         test_packages['TestRepo2']['x86_64']['zziplib'] = \
             [
                 'zziplib.i686',
+                'zziplib.x86_64',
             ]
         test_packages['TestRepo2']['x86_64']['389-ds-base-new'] = \
             [
                 '389-ds-base-new.x86_64',
             ]
+        test_packages['TestRepo']['x86_64']['zziplib'] = \
+            [
+                'zziplib.x86_64',
+            ]
         result = pg.generate_packages_json()
         self.assertEqual(
             test_packages,