From 574d6751b1cb06ee4a73491b44d810fde4a20b25 Mon Sep 17 00:00:00 2001
From: Thomas Oulevey <thomas.oulevey@cern.ch>
Date: Jun 12 2015 09:00:46 +0000
Subject: - fix software collection with latest format agreed with the SIG.


---

diff --git a/scripts/common7.sh b/scripts/common7.sh
index 1653f5a..8d856b2 100644
--- a/scripts/common7.sh
+++ b/scripts/common7.sh
@@ -1,4 +1,4 @@
-SIG=nfv
+SIG=sclo
 DIST=7
 DISTTAG=el7
 
diff --git a/scripts/create_sig.sh b/scripts/create_sig.sh
index 3dcf5d9..349c01b 100755
--- a/scripts/create_sig.sh
+++ b/scripts/create_sig.sh
@@ -143,7 +143,9 @@ do
 					REALTAG=$TAG
 					if ( $optionc )
 					then
-						TAG="$TAG-$COLLECTIONS"
+						# Abandon collection in the name for the tag, not pratical
+						# TAG="$TAG-$COLLECTIONS"
+						TAG="$TAG"
 					fi
 					$KOJI list-tags | grep $R_SIG-$TAG-build &> /dev/null 
 					if [ $? -eq 0 ]
@@ -166,8 +168,8 @@ do
 					# Add <collection>-build to the buildroot if collection enabled
 					if ( $optionc )
                         		then
-						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build
-				$KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build
+						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
+				$KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools $COLLECTIONS-build scl-utils-build
 					else
 						$KOJI add-group-pkg $R_SIG-$TAG-build build bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which buildsys-macros-$REALTAG tar buildsys-tools
                                 		$KOJI add-group-pkg $R_SIG-$TAG-build srpm-build bash buildsys-macros curl cvs redhat-release gnupg make redhat-rpm-config rpm-build shadow-utils buildsys-macros-$REALTAG tar buildsys-tools
@@ -189,7 +191,7 @@ do
 					then
 						if [ "x$REALTAG" != "x$DEFAULT_DISTTAG" ]
 						then
-							echo " -> [WARN] buildsys-macros-$REALTAG rpm not found. Please build it within koji."
+							echo " -> [WARN] buildsys-macros-$REALTAG rpm not found. Please build it within koji on target buildsys${DIST}"
 							[ -f $PWD/etc/buildsys.spec.template ] && echo " -> Generating buildsys-macros-$TAG.spec"
 						fi
 					fi