@@ -1,10 +1,10 @@

 Summary:	Domain Name System software

 Name:		bindutils

 Version:	9.10.1

-Release:	P1%{?dist}

+Release:	1%{?dist}

 License:	ISC

 URL:		http://www.isc.org/downloads/bind/

-Source0:	ftp://ftp.isc.org/isc/bind9/9.10.1-P1/bind-%{version}-%{release}.tar.gz

+Source0:	ftp://ftp.isc.org/isc/bind9/9.10.1-P1/bind-%{version}.tar.gz

 %define sha1 bind=24a81ba458a762c27be47461301fcf336cfb1d43

 Group:		Development/Tools

 Vendor:		VMware, Inc.

@@ -16,7 +16,7 @@ BIND is open source software that implements the Domain Name System (DNS) protoc

 for the Internet. It is a reference implementation of those protocols, but it is 

 also production-grade software, suitable for use in high-volume and high-reliability applications.

 %prep

-%setup -qn bind-%{version}-%{release}

+%setup -qn bind-%{version}

 %build

 ./configure \

 	--prefix=%{_prefix}

@@ -25,6 +25,7 @@ class PackageUtils(object):

         self.rpmbuildBinary = "rpmbuild"

         self.rpmbuildBuildallOption = "-ba --clean"

         self.rpmbuildNocheckOption = "--nocheck"

+        self.rpmbuildDistOption = '--define \\\"dist %s\\\"' % constants.dist

         self.queryRpmPackageOptions = "-qa"

         self.forceRpmPackageOptions = "--force"

         self.adjustGCCSpecScript="adjust-gcc-specs.sh"

@@ -152,7 +153,7 @@ class PackageUtils(object):

     def buildRPM(self,specFile,logFile,chrootCmd):

-        rpmBuildcmd= self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildNocheckOption

+        rpmBuildcmd= self.rpmbuildBinary+" "+self.rpmbuildBuildallOption+" "+self.rpmbuildNocheckOption +" "+self.rpmbuildDistOption

         rpmBuildcmd+=" "+specFile

         cmdUtils = CommandUtils()

@@ -178,7 +179,7 @@ class PackageUtils(object):

         cmdUtils = CommandUtils()

         version = constants.specData.getVersion(package)

         release = constants.specData.getRelease(package)

-        listFoundRPMFiles = cmdUtils.findFile(package+"-"+version+"-"+release+"*.rpm",constants.rpmPath)

+        listFoundRPMFiles = cmdUtils.findFile(package+"-"+version+"-"+release+".*.rpm",constants.rpmPath)

         if len(listFoundRPMFiles) == 1 :

             return listFoundRPMFiles[0]

         if len(listFoundRPMFiles) == 0 :

@@ -1,3 +1,4 @@

+import constants

 class rpmMacro(object):

@@ -31,7 +32,7 @@ class Package(object):

         self.version=""

         self.release=""

         self.buildarch="x86_64"

-        self.distribution=""

+        self.distribution=constants.constants.dist

         self.basePkgName=""

         self.sources=[]

@@ -31,7 +31,7 @@ class ToolChainUtils(object):

     def prepareBuildRoot(self,chrootID):

         self.logger.info("Preparing build environment")

         cmdUtils = CommandUtils()

-        prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID+" "+constants.specPath+" "+constants.rpmPath+" "+constants.logPath

+        prepareChrootCmd=self.prepareBuildRootCmd+" "+chrootID+" "+constants.specPath+" "+constants.rpmPath+" "+constants.logPath + " " + constants.dist

         logFile=constants.logPath+"/prepareBuildRoot.log"

         returnVal=cmdUtils.runCommandInShell(prepareChrootCmd,logFile)

         if not returnVal:

@@ -28,6 +28,7 @@ def main():

     parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Numbeer of working threads")

     parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

     parser.add_option("-c",  "--pullsources-config", dest="pullsourcesConfig",  default="pullsources.conf")

+    parser.add_option("-d",  "--dist", dest="dist",  default="phTP2")

     (options,  args) = parser.parse_args()

     cmdUtils=CommandUtils()

@@ -5,6 +5,7 @@ class constants(object):

     sourcePath=""

     rpmPath=""

     logPath=""

+    dist=""

     topDirPath=""

     specData=None

     buildRootPath="/mnt"

@@ -48,6 +49,7 @@ class constants(object):

     @staticmethod

     def initialize(options):

+        constants.dist = options.dist

         constants.specPath = options.specPath

         constants.sourcePath = options.sourcePath

         constants.rpmPath = options.rpmPath

@@ -21,6 +21,7 @@ BUILDROOT=$1

 SPEC_PATH=$2

 RPM_PATH=$3

 LOG_PATH=$4

+DIST=$5

 PARENT=/usr/src/photon

 LOGFILE="$(date +%Y-%m-%d).log"

@@ -58,7 +59,7 @@ if [ -z ${RPMPKG} ] ; then

 FSSPEC="$(find -L $SPEC_PATH -name 'filesystem.spec' -print)"

 test -z ${RPMPKG} || fail "Unable to find filesystem.spec file in $SPEC_PATH"

 #run_command "	Extracting filesystem spec" "cp ${FSSPEC} ${BUILDROOT}/${PARENT}/SPECS" "$LOG_PATH/filesystem.log"

-run_command "Building filesystem rpm" "rpmbuild -ba --nocheck --define \"_topdir ${BUILDROOT}/${PARENT}\" --define \"_dbpath ${BUILDROOT}/var/lib/rpm\" ${FSSPEC}" "$LOG_PATH/filesystem.log"

+run_command "Building filesystem rpm" "rpmbuild -ba --nocheck --define \"_topdir ${BUILDROOT}/${PARENT}\" --define \"_dbpath ${BUILDROOT}/var/lib/rpm\" --define \"dist ${DIST}\" ${FSSPEC}" "$LOG_PATH/filesystem.log"

 #run_command "	Building filesystem rpm " "rpmbuild -ba --nocheck --root ${BUILDROOT} --define '_topdir ${PARENT}' --define '_dbpath /var/lib/rpm' ${BUILDROOT}${PARENT}/SPECS/filesystem.spec" "$LOG_PATH/filesystem.log"

 run_command "	Extracting filesystem rpm" "cp ${BUILDROOT}/${PARENT}/RPMS/x86_64/filesystem*.rpm ${RPM_PATH}/x86_64/" "$LOG_PATH/filesystem.log"

 fi

@@ -12,7 +12,7 @@ autogen-5.18.5.tar.gz - cd24a7944d646f6aaea5c7ed13018de38c45b3da

 automake-1.14.1.tar.xz - 2ced676f6b792a95c5919243f81790b1172c7f5b

 bash-4.3.tar.gz - 45ac3c5727e7262334f4dfadecdf601b39434e84

 bc-1.06.95.tar.bz2 - 18717e0543b1dda779a71e6a812f11b8261a705a

-bind-9.10.1-P1.tar.gz - 24a81ba458a762c27be47461301fcf336cfb1d43

+bind-9.10.1.tar.gz - 93c7c6ac7d621f9dc1eaee9a0221bbaac89f1105

 binutils-2.25.tar.bz2 - b46cc90ebaba7ffcf6c6d996d60738881b14e50d

 bison-3.0.2.tar.xz - aeb1e3544007124009e5203afe86a5676580d444

 blfs-bootscripts-20140919.tar.bz2 - 762b68f79f84463a6b1dabb69e9dbdc2c43f32d8