Update packages file for version 32830

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -304,16 +304,21 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if ! git branch | grep -q -E '^\* master'; then \
+	@if [ "$$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then \
 		echo "Error: Must be on the master branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
-	if ! git diff --quiet HEAD ${SPECFILE}; then \
+	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
 		echo "Error: All changes to ${SPECFILE} must be committed first" >&2; \
 		exit 1; \
 	fi; \
-	if git rev-parse --verify --quiet origin/master > /dev/null; then \
+	git fetch; \
+	if git rev-parse --verify --quiet origin/master >/dev/null; then \
 		git pull --rebase; \
+	fi; \
+	if git ls-remote --tags --exit-code origin $(SRPMVERS) >/dev/null; then \
+		echo "Error: remote tag $(SRPMVERS) already exists" >&2; \
+		exit 1; \
 	fi
 	git tag $(SRPMVERS)
 	git push origin master refs/tags/$(SRPMVERS)

patchfilter.py

@@ -102,6 +102,22 @@ def zap_entire_file_end(filename):
         if file.endswith(filename):
             files.remove(file)                
             
+def zap_line_in_file_substring(filename, match):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    for file in files:
+        if file.endswith(filename):
+            for chunk in files_chunks[file]:
+                to_delete = list()
+                for line in chunk:
+                    if match in line:
+                        to_delete.append(line)
+                for line in to_delete:
+                    chunk.remove(line)
+            
+
 def zap_line_in_file(filename, match):
     global header
     global files
@@ -209,6 +225,11 @@ def main():
     zap_entire_file_end("xz.sig")
     zap_entire_file_end("gz.sig")
     zap_entire_file_end("bz2.sig")
+    zap_entire_file_end("xz.asc")
+    zap_entire_file_end("gz.asc")
+    zap_entire_file_end("bz2.asc")
+    
+    zap_entire_file_end(".pkey")
     
     zap_line_in_file("b/testresults", "Total : 0")
     zap_line_in_file("b/testresults", "Pass : 0")
@@ -223,7 +244,6 @@ def main():
     
     zap_line_in_file_start(".spec", "Release  :")
     zap_line_in_file_start(".spec", "Source99 :")
-    zap_line_in_file_start(".spec", "Source0  :")
     zap_line_in_file_start(".spec", "export SOURCE_DATE_EPOCH")
     zap_line_in_file_start(".spec", "export AR=gcc-ar")
     zap_line_in_file_start(".spec", "export RANLIB=gcc-ranlib")
@@ -273,6 +293,7 @@ def main():
 
     zap_line_in_file("b/options.conf", "archives = ")
     zap_line_in_file("b/options.conf", "giturl = ")
+    zap_line_in_file_start("b/options.conf", "url = ")
     zap_line_in_file("b/options.conf", "[package]")
     zap_line_in_file("b/options.conf", "")
     zap_line_in_file("b/options.conf", "[autospec]")
@@ -329,8 +350,13 @@ def main():
     zap_line_in_file("b/options.conf", "# require package verification for build")
     zap_line_in_file("b/options.conf", "verify_required = true")
     zap_line_in_file("b/options.conf", "# do not generate debuginfo for this package")
+    zap_line_in_file("b/options.conf", "# configure build also for openmpi")
+    zap_line_in_file("b/options.conf", "openmpi = false")
+    zap_line_in_file("b/options.conf", "alias =")
+    zap_line_in_file("b/options.conf", "alias = ")
     zap_line_in_file("b/options.conf", "nodebug = false")
     zap_line_in_file("b/options.conf", "domain =")
+    zap_line_in_file("b/options.conf", "domain = ")
 
     zap_line_in_file("b/buildreq_add", "# This file contains additional build requirements that did not get")
     zap_line_in_file("b/buildreq_add", "# picked up automatically. One name per line, no whitespace.")
@@ -358,7 +384,9 @@ def main():
     zap_entire_file("b/whatrequires")
     zap_entire_file("b/versions")
     zap_entire_file("b/.gitignore")
+    
 
+    zap_line_in_file_substring(".spec", "%{buildroot}/usr/share/package-licenses")   # version number change in license copy
     zap_empty_chunks()
     
     print_all()

user-setup.sh

@@ -102,7 +102,7 @@ fi
 
 required_progs() {
   local bindir="/usr/bin"
-  for f in git mock rpm rpmbuild ; do
+  for f in git mock rpm rpmbuild diffstat ; do
     [ ! -x "${bindir}/${f}" ] && missing+="${f} "
   done
   [ "$PEM" ] && [ ! -x /usr/bin/koji ] && missing+="koji "