@@ -21,6 +21,7 @@ class SerializableSpecObject(object):

         self.url=""

         self.sourceurl=""

         self.license=""

+        self.specDefs={}

 class SerializableSpecObjectsUtils(object):

@@ -47,6 +48,7 @@ class SerializableSpecObjectsUtils(object):

             specObj.release=spec.getRelease()

             specObj.listSources=spec.getSourceNames()

             specObj.checksums=spec.getChecksums()

+            specObj.specDefs=spec.getDefinitions()

             specObj.listPatches=spec.getPatchNames()

             specObj.securityHardening=spec.getSecurityHardeningOption()

             specObj.isCheckAvailable=spec.isCheckAvailable()

@@ -97,7 +99,8 @@ class SerializableSpecObjectsUtils(object):

     def getRPMMacros(self):

         return self.userDefinedMacros

-    def processData(self, data):

+    def processData(self, package, data):

+        #User macros

         for macroName in self.userDefinedMacros.keys():

             value = self.userDefinedMacros[macroName]

             macro="%{?"+macroName+"}"

@@ -111,11 +114,27 @@ class SerializableSpecObjectsUtils(object):

             macro="%"+macroName

             if data.find(macro) != -1:

                 data = data.replace(macro,value)

+        #Spec definitions

+        specName=self.getSpecName(package)

+        specDefs =  self.mapSerializableSpecObjects[specName].specDefs

+        for macroName in specDefs.keys():

+            value = specDefs[macroName]

+            macro="%{?"+macroName+"}"

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

+                continue

+            macro="%{"+macroName+"}"

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

+                continue

+            macro="%"+macroName

+            if data.find(macro) != -1:

+                data = data.replace(macro,value)

         return data

     def getRelease(self, package):

         specName=self.getSpecName(package)

-        return self.processData(self.mapSerializableSpecObjects[specName].release)

+        return self.processData(package, self.mapSerializableSpecObjects[specName].release)

     def getVersion(self, package):

         specName=self.getSpecName(package)

@@ -194,21 +213,21 @@ class SerializableSpecObjectsUtils(object):

         url = self.mapSerializableSpecObjects[specName].url

         if url is None:

             return None

-        return self.processData(url)

+        return self.processData(package, url)

     def getSourceURL(self, package):

         specName=self.getSpecName(package)

         sourceurl = self.mapSerializableSpecObjects[specName].sourceurl

         if sourceurl is None:

             return None

-        return self.processData(sourceurl)

+        return self.processData(package, sourceurl)

     def getLicense(self, package):

         specName=self.getSpecName(package)

         license = self.mapSerializableSpecObjects[specName].license

         if license is None:

             return None

-        return self.processData(license)

+        return self.processData(package, license)

     def printAllObjects(self):

         listSpecs=self.mapSerializableSpecObjects.keys()

@@ -13,6 +13,7 @@ class SpecParser(object):

         self.packages={}

         self.specAdditionalContent=""

         self.globalSecurityHardening=""

+        self.defs={}

     def readPkgNameFromPackageMacro(self,data,basePkgName=None):

@@ -71,6 +72,8 @@ class SpecParser(object):

                 self.readSecurityHardening(line)

             elif self.isChecksum(line):

                 self.readChecksum(line, self.packages[currentPkg])

+            elif self.isDefinition(line):

+                self.readDefinition(line)

             else:

                 self.specAdditionalContent+=line+"\n"

             i=i+1

@@ -207,6 +210,20 @@ class SpecParser(object):

             return True

         return False

+    def isDefinition(self,line):

+        if re.search('^'+'%define',line) :

+            return True

+        if re.search('^'+'%global',line) :

+            return True

+        return False

+

+    def readDefinition(self,line):

+        listDefines=line.split()

+        if len(listDefines) == 3:

+           self.defs[listDefines[1]] = listDefines[2]

+           return True

+        return False

+

     def readHeader(self,line):

         headerSplitIndex=line.find(":")

         if(headerSplitIndex+1 == len(line) ):

@@ -222,6 +222,9 @@ class Specutils(object):

             check=True

         return check

+    def getDefinitions(self):

+        return self.spec.defs

+

 def main():

     spec = Specutils("/workspace1/myrepos/photon/SPECS/docker/docker.spec")

     print "packages",spec.getPackageNames()