@@ -41,7 +41,7 @@ class PackageBuildDataGenerator(object):

         return list(self.__buildDependencyGraph.keys())

     def _createSortListForPkg(self, pkg):

-        runTimeDepPkgList = self.__runTimeDependencyGraph[pkg]

+        runTimeDepPkgList = list(set(self.__runTimeDependencyGraph[pkg]))

         runTimeDepPkgList.append(pkg)

         sortListForPkg = []

@@ -135,7 +135,7 @@ class PackageBuildDataGenerator(object):

             dependentRpmPackages = SPECS.getData().getBuildRequiresForPackage(basePackage)

             dependentPackages = set()

             for rpmPkg in dependentRpmPackages:

-                basePkg = SPECS.getData().getSpecName(rpmPkg)

+                basePkg = SPECS.getData().getSpecName(rpmPkg.package)

                 dependentPackages.add(basePkg)

             self.__buildDependencyGraph[basePackage] = dependentPackages

             nextPackagesToConstructGraph.update(dependentPackages)

@@ -143,10 +143,13 @@ class PackageBuildDataGenerator(object):

         if addRunTimeGraph:

             rpmPackages = SPECS.getData().getPackages(basePackage)

             dependentPackages = set()

+            dependentRpmPackagesNames= set()

             for rpmPkg in rpmPackages:

                 dependentRpmPackages = SPECS.getData().getRequiresAllForPackage(rpmPkg)

-                self.__runTimeDependencyGraph[rpmPkg] = copy.copy(dependentRpmPackages)

-                for pkg in dependentRpmPackages:

+                for pkgName in dependentRpmPackages:

+                    dependentRpmPackagesNames.add(pkgName.package)

+                self.__runTimeDependencyGraph[rpmPkg] = copy.copy(dependentRpmPackagesNames)

+                for pkg in dependentRpmPackagesNames:

                     dependentPackages.add(SPECS.getData().getSpecName(pkg))

             nextPackagesToConstructGraph.update(dependentPackages)

@@ -91,48 +91,14 @@ class PackageBuilderBase(object):

     def _findBuildTimeCheckRequiredPackages(self, index=0):

         return SPECS.getData().getCheckBuildRequiresForPackage(self.package, index)

-    def _findRunTimeRequiredRPMPackagesParseObj(self,rpmPackage):

-        listRequiredPackages=SPECS.getData().getRequiresParseObjForPackage(rpmPackage)

-        return listRequiredPackages

-

-    def _findBuildTimeRequiredPackagesParseObj(self, index):

-        listRequiredPackages=SPECS.getData().getBuildRequiresParseObjForPackage(self.package, index)

-        return listRequiredPackages

-

-    def _findBuildTimeCheckRequiredPackagesParseObj(self, index):

-        listRequiredPackages=SPECS.getData().getCheckBuildRequiresParseObjForPackage(self.package, index)

-        return listRequiredPackages

-

-    def _getProperVersion(self,package,parseSpecObj):

-        listOfVersionObjs=self.getSpecObj(package)

-        for num in listOfVersionObjs:

-                if parseSpecObj.compare == 'gte':

-                       if LooseVersion(num.version) >= LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'lte':

-                        if LooseVersion(num.version) <= LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'eq':

-                        if LooseVersion(num.version) == LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'lt':

-                        if LooseVersion(num.version) < LooseVersion(parseSpecObj.version):

-                                return num.version

-                elif parseSpecObj.compare == 'gt':

-                        if LooseVersion(num.version) > LooseVersion(parseSpecObj.version):

-                                return num.version

-        return "*"

-

-

     def _installPackage(self, pkgUtils, package,packageVersion, instanceID, destLogPath,

                         listInstalledPackages, listInstalledRPMs):

-        latestRPM = os.path.basename(

-            pkgUtils.findRPMFileForGivenPackage(package)).replace(".rpm", "")

-        if package in listInstalledPackages and latestRPM in listInstalledRPMs:

-            return

+        specificRPM = os.path.basename(pkgUtils.findRPMFileForGivenPackage(package,packageVersion)).replace(".rpm", "")

+        if package in listInstalledPackages:

+                return

         # mark it as installed -  to avoid cyclic recursion

         listInstalledPackages.append(package)

-        listInstalledRPMs.append(latestRPM)

+        listInstalledRPMs.append(specificRPM)

         self._installDependentRunTimePackages(pkgUtils, package, instanceID, destLogPath,

                                               listInstalledPackages, listInstalledRPMs)

         noDeps = False

@@ -148,7 +114,6 @@ class PackageBuilderBase(object):

     def _installDependentRunTimePackages(self, pkgUtils, package, instanceID, destLogPath,

                                          listInstalledPackages, listInstalledRPMs):

         listRunTimeDependentPackages = self._findRunTimeRequiredRPMPackages(package)

-        listRunTimeDependentPackagesParseObj=self._findRunTimeRequiredRPMPackagesParseObj(package)

         if listRunTimeDependentPackages:

             for pkg in listRunTimeDependentPackages:

                 if pkg in self.mapPackageToCycles:

@@ -157,40 +122,26 @@ class PackageBuilderBase(object):

                     pkgUtils.findRPMFileForGivenPackage(pkg)).replace(".rpm", "")

                 if pkg in listInstalledPackages and latestPkgRPM in listInstalledRPMs:

                     continue

-                flag = False

-                for objName in listRunTimeDependentPackagesParseObj:

-                    if objName.package == pkg:

-                        properVersion=self._getProperVersion(pkg,objName)

-                        self._installPackage(pkgUtils, pkg,properVersion, instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

-                        flag = True

-                        break;

-                if flag == False:

-                        self._installPackage(pkgUtils, pkg,"*", instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

+                self._installPackage(pkgUtils, pkg,"*", instanceID, destLogPath,listInstalledPackages, listInstalledRPMs)

     def _findDependentPackagesAndInstalledRPM(self, instanceID, index=0):

         listInstalledPackages, listInstalledRPMs = self._findInstalledPackages(instanceID)

         self.logger.info(listInstalledPackages)

         listDependentPackages = self._findBuildTimeRequiredPackages(index)

-        listDependentPackagesParseObj=self._findBuildTimeRequiredPackagesParseObj(index)

+        listTestPackages=[]

         if constants.rpmCheck and self.package in constants.testForceRPMS:

             listDependentPackages.extend(self._findBuildTimeCheckRequiredPackages(index))

-            listDependentPackagesParseObj.extend(self._findBuildTimeCheckRequiredPackagesParseObj(index))

             testPackages = (set(constants.listMakeCheckRPMPkgtoInstall) -

                             set(listInstalledPackages) -

                             set([self.package]))

-            listDependentPackages.extend(testPackages)

+            listTestPackages=list(set(testPackages))

             listDependentPackages = list(set(listDependentPackages))

-            listDependentPackagesParseObj=list(set(listDependentPackagesParseObj))

-        return listDependentPackages, listDependentPackagesParseObj,listInstalledPackages, listInstalledRPMs

+        return listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs

     @staticmethod

     def getNumOfVersions(package):

         return SPECS.getData().getNumberOfVersions(package)

-    @staticmethod

-    def getSpecObj(package):

-        return SPECS.getData().getSpecObj(package)

-

 class PackageBuilderContainer(PackageBuilderBase):

     def __init__(self, mapPackageToCycles, pkgBuildType):

         self.buildContainerImage = "photon_build_container:latest"

@@ -298,7 +249,7 @@ class PackageBuilderContainer(PackageBuilderBase):

                     constants.perPackageToolChain[self.package].get(platform.machine(), []),

                     self.package)

-            listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = (

+            listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

                 self._findDependentPackagesAndInstalledRPM(containerID, index))

             pkgUtils = PackageUtils(self.logName, self.logPath)

@@ -307,10 +258,13 @@ class PackageBuilderContainer(PackageBuilderBase):

                                  "Installing dependent packages..")

                 self.logger.info(listDependentPackages)

                 for pkg in listDependentPackages:

+                    properVersion=pkgUtils._getProperVersion(pkg.package,pkg)

+                    self._installPackage(pkgUtils, pkg.package,properVersion, containerID, destLogPath,listInstalledPackages, listInstalledRPMs)

+                for pkg in listTestPackages:

                     flag = False

-                    for objName in listDependentPackagesParseObj:

-                        if objName.package == pkg:

-                                properVersion=self._getProperVersion(pkg,objName)

+                    for lineContent in listDependentPackages:

+                        if lineContent.package == pkg:

+                                properVersion=pkgUtils._getProperVersion(pkg,lineContent)

                                 self._installPackage(pkgUtils, pkg,properVersion, containerID, destLogPath,listInstalledPackages, listInstalledRPMs)

                                 flag = True

                                 break;

@@ -385,7 +339,7 @@ class PackageBuilderChroot(PackageBuilderBase):

         chrootID = None

         try:

             chrootID = self._prepareBuildRoot()

-            listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = (

+            listDependentPackages, listTestPackages, listInstalledPackages, listInstalledRPMs = (

                 self._findDependentPackagesAndInstalledRPM(chrootID, index))

             pkgUtils = PackageUtils(self.logName, self.logPath)

@@ -393,10 +347,13 @@ class PackageBuilderChroot(PackageBuilderBase):

             if listDependentPackages:

                 self.logger.info("Installing the build time dependent packages......")

                 for pkg in listDependentPackages:

+                    properVersion=pkgUtils._getProperVersion(pkg.package, pkg)

+                    self._installPackage(pkgUtils, pkg.package,properVersion, chrootID, self.logPath,listInstalledPackages, listInstalledRPMs)

+                for pkg in listTestPackages:

                     flag = False

-                    for objName in listDependentPackagesParseObj:

-                        if objName.package == pkg:

-                                properVersion=self._getProperVersion(pkg,objName)

+                    for lineContent in listDependentPackages:

+                        if lineContent.package == pkg:

+                                properVersion=pkgUtils._getProperVersion(pkg,lineContent)

                                 self._installPackage(pkgUtils, pkg,properVersion, chrootID, self.logPath,listInstalledPackages, listInstalledRPMs)

                                 flag = True

                                 break;

@@ -9,6 +9,7 @@ from Logger import Logger

 from constants import constants

 import PullSources

 from SpecData import SPECS

+from distutils.version import LooseVersion

 class PackageUtils(object):

@@ -431,6 +432,26 @@ class PackageUtils(object):

         rpmDestDir = rpmDir + "/" + arch

         return rpmDestDir

+    def _getProperVersion(self,package,parseSpecObj):

+        listOfVersionObjs=SPECS.getData().getSpecObj(package)

+        for num in listOfVersionObjs:

+                if parseSpecObj.compare == 'gte':

+                       if LooseVersion(num.version) >= LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'lte':

+                        if LooseVersion(num.version) <= LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'eq':

+                        if LooseVersion(num.version) == LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'lt':

+                        if LooseVersion(num.version) < LooseVersion(parseSpecObj.version):

+                                return num.version

+                elif parseSpecObj.compare == 'gt':

+                        if LooseVersion(num.version) > LooseVersion(parseSpecObj.version):

+                                return num.version

+        return "*"

+

     def _copyRPM(self, rpmFile, destDir):

         cmdUtils = CommandUtils()

         rpmName = os.path.basename(rpmFile)

@@ -105,7 +105,7 @@ class Scheduler(object):

         listRequiredPackages = []

         for pkg in listRequiredRPMPackages:

-            basePkg = SPECS.getData().getSpecName(pkg)

+            basePkg = SPECS.getData().getSpecName(pkg.package)

             if basePkg not in listRequiredPackages:

                 listRequiredPackages.append(basePkg)

@@ -205,7 +205,7 @@ class Scheduler(object):

         listRequiredPackages = []

         for pkg in listRequiredRPMPackages:

-            basePkg = SPECS.getData().getSpecName(pkg)

+            basePkg = SPECS.getData().getSpecName(pkg.package)

             if basePkg not in listRequiredPackages:

                 listRequiredPackages.append(basePkg)

@@ -21,9 +21,6 @@ class SpecObject(object):

         self.checkBuildRequirePackages = []

         self.installRequiresAllPackages = []

         self.installRequiresPackages = {}

-        self.specParseObjBuildRequirePackages = []

-        self.specParseObjInstallRequiresPackages=[]

-        self.specParseObjCheckBuildRequirePackages=[]

         self.specFile = ""

         self.listSources = []

         self.checksums = {}

@@ -50,9 +47,9 @@ class SpecObjectsUtils(object):

             specName = spec.getBasePackageName()

             specObj = SpecObject()

             specObj.name = specName

-            specObj.buildRequirePackages,specObj.specParseObjBuildRequirePackages = spec.getBuildRequiresAllPackages()

-            specObj.installRequiresAllPackages,specObj.specParseObjInstallRequiresPackages = spec.getRequiresAllPackages()

-            specObj.checkBuildRequirePackages,specObj.specParseObjCheckBuildRequirePackages = spec.getCheckBuildRequiresAllPackages()

+            specObj.buildRequirePackages = spec.getBuildRequiresAllPackages()

+            specObj.installRequiresAllPackages = spec.getRequiresAllPackages()

+            specObj.checkBuildRequirePackages = spec.getCheckBuildRequiresAllPackages()

             specObj.listPackages = spec.getPackageNames()

             specObj.specFile = specFile

             specObj.version = spec.getVersion()

@@ -110,22 +107,18 @@ class SpecObjectsUtils(object):

         specName = self.getSpecName(package)

         return self.mapSpecObjects[specName][index].checkBuildRequirePackages

-    def getBuildRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjBuildRequirePackages

-

-    def getRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjInstallRequiresPackages

-

-    def getCheckBuildRequiresParseObjForPackage(self, package, index=0):

-        specName=self.getSpecName(package)

-        return self.mapSpecObjects[specName][index].specParseObjCheckBuildRequirePackages

-

     def getSpecObj(self, package):

         specName=self.getSpecName(package)

         return self.mapSpecObjects[specName]

+    def getPkgNamesFromObj(self, objlist):

+        listPkgName=[]

+        listPkgNames=list(set(objlist))

+        for name in listPkgNames:

+                listPkgName.append(name.package)

+        listPkgName=list(set(listPkgName))

+        return listPkgName

+

     def getRelease(self, package, index=0):

         specName = self.getSpecName(package)

         return self.mapSpecObjects[specName][index].release

@@ -225,11 +218,11 @@ class SpecObjectsUtils(object):

             self.logger.info(" ")

             self.logger.info(" ")

             self.logger.info("Build require packages")

-            self.logger.info(specObj.buildRequirePackages)

+            self.logger.info(self.getPkgNamesFromObj(specObj.buildRequirePackages))

             self.logger.info(" ")

             self.logger.info(" ")

             self.logger.info("install require packages")

-            self.logger.info(specObj.installRequiresAllPackages)

+            self.logger.info(self.getPkgNamesFromObj(specObj.installRequiresAllPackages))

             self.logger.info(" ")

             self.logger.info(specObj.installRequiresPackages)

             self.logger.info("security_hardening: " + specObj.securityHardening)

@@ -92,52 +92,39 @@ class Specutils(object):

     def getRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.requires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

-        dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        specParseObjDependentPackagesTemp = specParseObjDependentPackages[:]

+                dependentPackages.append(dpkg)

+        listDependentPackages = list(set(dependentPackages))

         packageNames = self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in dependentPackages:

-                dependentPackages.remove(pkgName)

-            for objName in specParseObjDependentPackagesTemp:

+            for objName in listDependentPackages:

                 if objName.package == pkgName:

-                        specParseObjDependentPackages.remove(objName)

-        return dependentPackages,specParseObjDependentPackages

+                        dependentPackages.remove(objName)

+        dependentPackages = list(set(dependentPackages))

+        return dependentPackages

     def getBuildRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.buildrequires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

-        dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        specParseObjDependentPackagesTemp = specParseObjDependentPackages[:]

+                dependentPackages.append(dpkg)

+        listDependentPackages = list(set(dependentPackages))

         packageNames = self.getPackageNames()

         for pkgName in packageNames:

-            if pkgName in dependentPackages:

-                dependentPackages.remove(pkgName)

-            for objName in specParseObjDependentPackagesTemp:

+            for objName in listDependentPackages:

                 if objName.package == pkgName:

-                        specParseObjDependentPackages.remove(objName)

-        return dependentPackages,specParseObjDependentPackages

+                        dependentPackages.remove(objName)

+        dependentPackages = list(set(dependentPackages))

+        return dependentPackages

     def getCheckBuildRequiresAllPackages(self):

         dependentPackages = []

-        specParseObjDependentPackages=[]

         for pkg in self.spec.packages.values():

             for dpkg in pkg.checkbuildrequires:

-                dependentPackages.append(dpkg.package)

-                specParseObjDependentPackages.append(dpkg)

+                dependentPackages.append(dpkg)

         dependentPackages = list(set(dependentPackages))

-        specParseObjDependentPackages = list(set(specParseObjDependentPackages))

-        return dependentPackages,specParseObjDependentPackages

+        return dependentPackages

     def getRequires(self, pkgName):

         dependentPackages = []

@@ -196,8 +183,8 @@ def main():

     print("requires {}".format(spec.getRequires('libtool')))

     print("provides {}".format(spec.getProvides('libtool')))

-    print("all-requires {}".format(spec.getRequiresAllPackages()))

-    print("all-build-requires {}".format(spec.getBuildRequiresAllPackages()))

+    print("all-requires {}".format(spec.getPkgNamesFromObj(spec.getRequiresAllPackages())))

+    print("all-build-requires {}".format(spec.getPkgNamesFromObj(spec.getBuildRequiresAllPackages())))

 if __name__ == '__main__':

     main()

@@ -7,6 +7,7 @@ from ChrootUtils import ChrootUtils

 from Logger import Logger

 from PackageUtils import PackageUtils

 from constants import constants

+from SpecData import SPECS

 class ToolChainUtils(object):

@@ -112,7 +113,13 @@ class ToolChainUtils(object):

             raise e

         return pkgCount

-    def installToolChainRPMS(self, chrootID, packageName, logPath=None):

+    def getListDependentPackageLineContent(self, index):

+        listBuildRequiresPkgLineContent=SPECS.getData().getBuildRequiresForPackage(self.package, index)

+        listBuildRequiresPkgLineContent.extend(SPECS.getData().getCheckBuildRequiresForPackage(self.package, index))

+        listBuildRequiresPkgLineContent=list(set(listBuildRequiresPkgLineContent))

+        return listBuildRequiresPkgLineContent

+

+    def installToolChainRPMS(self, chrootID, packageName, logPath=None,index=0):

         if logPath is None:

             logPath = self.logPath

         cmdUtils = CommandUtils()

@@ -120,16 +127,22 @@ class ToolChainUtils(object):

         self.logger.info("Installing Tool Chain RPMS.......")

         rpmFiles = ""

         packages = ""

+        self.package=packageName

+        listBuildRequiresPackageLineContent = self.getListDependentPackageLineContent(index)

         for package in constants.listToolChainRPMsToInstall:

             pkgUtils = PackageUtils(self.logName, self.logPath)

             rpmFile = None

+            version = "*"

+            for depPkg in listBuildRequiresPackageLineContent:

+                if depPkg.package == package:

+                        version=pkgUtils._getProperVersion(package,depPkg)

             if constants.rpmCheck:

-                rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

+                rpmFile = pkgUtils.findRPMFileForGivenPackage(package, version)

             else:

                 if (packageName not in constants.listToolChainRPMsToInstall or

                         constants.listToolChainRPMsToInstall.index(packageName) >

                         constants.listToolChainRPMsToInstall.index(package)):

-                    rpmFile = pkgUtils.findRPMFileForGivenPackage(package)

+                    rpmFile = pkgUtils.findRPMFileForGivenPackage(package, version)

             if rpmFile is None:

                 # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

                 if (package == "sqlite") and (platform.machine() == "x86_64"):