diff --git a/bootstrap-bundle.spec b/bootstrap-bundle.spec
index 18661eef22c..39b293aa611 100644
--- a/bootstrap-bundle.spec
+++ b/bootstrap-bundle.spec
@@ -34,7 +34,7 @@ rm -f %{i}/bin/xml2-config %{i}/lib/xml2Conf.sh
 %ifos darwin
 cp -P $GCC_ROOT/lib/lib{stdc++,gcc_s}*.%{soname} %{i}/lib
 %else
-cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s}.%{soname}* %{i}/lib
+cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s,gomp}.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf-*.%{soname} %{i}/lib
 cp -P $GCC_ROOT/lib/libdw.%{soname}* %{i}/lib
diff --git a/data-cmssw-package-build.file b/data-cmssw-package-build.file
deleted file mode 100644
index 42bc5938ca7..00000000000
--- a/data-cmssw-package-build.file
+++ /dev/null
@@ -1,43 +0,0 @@
-### FILE data-cmssw-package-build.file
-## NOCOMPILER
-
-%define realname %(echo %n | cut -d- -f2,3 | tr '-' '/') 
-%define realsub %(echo %n | cut -d- -f2) 
-%define BaseTool %(echo %n | tr '[a-z-]' '[A-Z_]')
-
-%if "%{?cvsrepo:set}" != "set"
-%define cvsrepo cvs://:pserver:anonymous@cmscvs.cern.ch:2401/local/reps/CMSSW?passwd=AA_:yZZ3e
-%endif
-
-%if "%{?dataDir:set}" != "set" 
-%define dataDir data
-%endif
-
-Source: %{cvsrepo}&tag=-r%{realversion}&module=%{realname}/%dataDir/download.url&export=%realsub&output=/src.tar.gz
-
-%prep
-%setup -n %realsub
- 
-%build
-download_cmd=`which wget 2> /dev/null || echo ""`
-if [ "X$download_cmd" = X ] ; then
-  download_cmd=`which curl 2> /dev/null || echo ""`
-  if [ "X$download_cmd" = X ] ; then
-    echo "ERROR: Unable to find wget or curl shell command to download" && exit 1
-  else
-    download_cmd="curl -L -f -q -s -O {}"
-  fi
-else
-  download_cmd="wget --no-check-certificate {}"
-fi
-cd ../%realname/%dataDir
-cat download.url | xargs -I "{}" $download_cmd
-rm download.url
-
-%install
-cd ..
-tar -cv %realname | tar -x -C %i
-
-%post
-echo "%{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
-echo "set %{BaseTool}_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh
diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt
index 3e31619c7a9..0f311ba1f2b 100644
--- a/data/cmsswdata.txt
+++ b/data/cmsswdata.txt
@@ -57,6 +57,7 @@ SimTransport-TotemRPProtonTransportParametrization=V00-01-00
 SimG4CMS-HGCalTestBeam=V01-00-00
 Fireworks-Geometry=V07-06-00
 SimG4CMS-Forward=V02-04-00
+GeneratorInterface-ReggeGribovPartonMCInterface=V00-00-02
 
 #Never update any package here. Always move it to default section.
 [cmssw-xmldata-build]
@@ -99,10 +100,6 @@ RecoHI-HiJetAlgos=V01-00-01
 RecoParticleFlow-PFTracking=V13-01-00
 SimTransport-HectorProducer=V01-00-01
 
-#Never update any package here. Always move it to default section.
-[data-cmssw-package-build]
-GeneratorInterface-ReggeGribovPartonMCInterface=V00-00-02
-
 #Never update any package here. Always move it to default section.
 [data-package-build]
 CalibCalorimetry-CaloMiscalibTools=V01-00-00
@@ -110,4 +107,4 @@ FastSimulation-MaterialEffects=V05-00-00
 L1Trigger-RPCTrigger=V00-15-00
 RecoParticleFlow-PFBlockProducer=V02-04-02
 SimG4CMS-Calo=V03-04-00
-Validation-Geometry=V00-07-00
\ No newline at end of file
+Validation-Geometry=V00-07-00
diff --git a/tensorflow-sources.file b/tensorflow-sources.file
index 57c109adac1..d5b135f39f9 100644
--- a/tensorflow-sources.file
+++ b/tensorflow-sources.file
@@ -35,8 +35,7 @@ BAZEL_OPTS="--batch --output_user_root ../build build -s --verbose_failures --di
 BAZEL_OPTS="$BAZEL_OPTS --copt=%{vectorize_flag}"
 %else
 %ifarch ppc64le
-BAZEL_OPTS="$BAZEL_OPTS --copt=-mcpu=native --copt=-mtune=native"
-BAZEL_OPTS="$BAZEL_OPTS --copt=--param=l1-cache-size=64 --copt=--param=l1-cache-line-size=128 --copt=--param=l2-cache-size=512"
+BAZEL_OPTS="$BAZEL_OPTS $(echo %{ppc64le_build_flags} | tr ' ' '\n' | grep -v '^$' | sed -e 's|^|--copt=|' | tr '\n' ' ')"
 %else
 BAZEL_OPTS="$BAZEL_OPTS --copt=-mcpu=native --copt=-mtune=native"
 %endif