Make all the rpm packages have the exactly same version and release numbers

Author: GONG Jie

Release

@@ -0,0 +1 @@
+snap000000000000

buildcore.sh

@@ -8,7 +8,7 @@
 #  - On AIX:  Install openssl and openssh installp pkgs and run updtvpkg.  Install from http://www.perzl.org/aix/ :
 #        apr, apr-util, bash, bzip2, db4, expat, gdbm, gettext, glib2, gmp, info, libidn, neon, openssl (won't
 #        conflict with the installp version - but i don't think you need this), pcre, perl-DBD-SQLite, perl-DBI,
-#        popt, python, readline, rsynce, sqlite, subversion, unixODBC, zlib.  
+#        popt, python, readline, rsynce, sqlite, subversion, unixODBC, zlib.
 #        Install wget from http://www-03.ibm.com/systems/power/software/aix/linux/toolbox/alpha.html
 #  - Run this script from the xcat-core directory.  It will create the other directories that are needed.
 #
@@ -24,7 +24,7 @@
 #                  (but the tarball file name will be like a released tarball, not a snap build).  When you are ready to
 #                  release this build, use PROMOTE=1 without PREGA
 #        BUILDALL=1 - build all rpms, whether they changed or not.  Should be used for snap builds that are in prep for a release.
-#        UP=0 or UP=1 - override the default upload behavior 
+#        UP=0 or UP=1 - override the default upload behavior
 #        GITUP=<filename> - control which rpms get built by specifying a coregitup file
 #        EMBED=<embedded-environment> - the environment for which a minimal version of xcat should be built, e.g. zvm or flex
 #        VERBOSE=1 - to see lots of verbose output
@@ -39,10 +39,10 @@ UPLOADUSER=litingt
 USER=xcat
 SERVER=xcat.org
 FILES_PATH="files"
-FRS=/var/www/${SERVER}/${FILES_PATH}
+FRS="/var/www/${SERVER}/${FILES_PATH}"
 RELEASE=github.com/xcat2/xcat-core/releases
 
-YUMDIR=$FRS
+YUMDIR="${FRS}"
 YUMREPOURL="http://${SERVER}/${FILES_PATH}/xcat/repos/yum"
 
 if [ "$1" = "-h"  ] || [ "$1" = "-help"  ] || [ "$1" = "--help"  ]; then
@@ -71,8 +71,8 @@ ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
 # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
-# xCAT-server has PCM specific configuration - RESTAPI(perl-JSON) 
-# xCAT-client has PCM specific configuration - getxcatdocs(perl-JSON) 
+# xCAT-server has PCM specific configuration - RESTAPI(perl-JSON)
+# xCAT-client has PCM specific configuration - getxcatdocs(perl-JSON)
 PCMBUILD="xCAT xCAT-server xCAT-client xCATsn"
 PCMLINK="perl-xCAT xCAT-buildkit xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 xCAT-vlan xCAT-probe"
 # Note: for FSM, the FlexCAT rpm is built separately from gsa/git
@@ -103,7 +103,7 @@ OSNAME=$(uname)
 
 if [ "$OSNAME" != "AIX" ]; then
     GSA=http://pokgsa.ibm.com/projects/x/xcat/build/linux
-    
+
         if [ "$(id -u)" == "0" ]; then
         # Get a lock, so can not do 2 builds at once
         exec 8>/var/lock/xcatbld-$REL.lock
@@ -186,10 +186,11 @@ function setversionvars {
     BUILD_TIME=`date`
     BUILD_MACHINE=`hostname`
     COMMIT_ID=`git rev-parse --short HEAD`
+    XCAT_RELEASE="snap$(date '+%Y%m%d%H%M')"
+    echo "$XCAT_RELEASE" >Release
 }
 
-
-if [ "$PROMOTE" != 1 ]; then      # very long if statement to not do builds if we are promoting
+if [ "$PROMOTE" != 1 ]; then      # very long if statement to not do builds if we are promoting  ### @LINE460 ###
 # we are doing a snap build
 CORE="core-snap"
 if [ "$OSNAME" = "AIX" ]; then
@@ -217,14 +218,14 @@ else
     #echo "source=$source"
 fi
 
-# 
-# If no pre-defined update file is provided, do a "git pull" to try and detect 
+#
+# If no pre-defined update file is provided, do a "git pull" to try and detect
 # if anything has changed in the source directories
-# 
+#
 SOMETHINGCHANGED=0
 if [ "$GIT" = "1" ]; then
-    # 
-    # To enable local sandbox build, GITPULL is disabled by default. 
+    #
+    # To enable local sandbox build, GITPULL is disabled by default.
     #
     if [ "$GITPULL" = "1" ] || [ ${PWD} == *"autobuild"* ]; then
         # TODO: This is really not necessary since the autobuild scripts
@@ -339,7 +340,7 @@ if [ "$OSNAME" != "AIX" ]; then
 fi
 
 # Build the xCAT and xCATsn rpms for all platforms
-for rpmname in xCAT xCATsn; do 
+for rpmname in xCAT xCATsn; do
     if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
     if [ $SOMETHINGCHANGED == 1 -o "$BUILDALL" == 1 ]; then        # used to be:  if $GREP -E "^[UAD] +$rpmname/" $GITUP; then
         UPLOAD=1
@@ -402,48 +403,49 @@ fi
 
 # Prepare the RPMs for pkging and upload
 WGET_CMD="wget"
-if [ ! -z ${LOG} ]; then 
+if [ ! -z ${LOG} ]; then
     WGET_CMD="wget -o ${LOG}"
 fi
 
 # get gpg keys in place
 if [ "$OSNAME" != "AIX" ]; then
     if [ -z "$RPMSIGN" -o "$RPMSIGN" == "1" ]; then
-    mkdir -p $HOME/.gnupg
-    for i in pubring.gpg secring.gpg trustdb.gpg; do
-        if [ ! -f $HOME/.gnupg/$i ] || [ `wc -c $HOME/.gnupg/$i|cut -f 1 -d' '` == 0 ]; then
-            rm -f $HOME/.gnupg/$i
-            ${WGET_CMD} -P $HOME/.gnupg $GSA/keys/$i
-            chmod 600 $HOME/.gnupg/$i
+        mkdir -p $HOME/.gnupg
+        for i in pubring.gpg secring.gpg trustdb.gpg; do
+            if [ ! -f $HOME/.gnupg/$i ] ||
+               [ `wc -c $HOME/.gnupg/$i|cut -f 1 -d' '` == 0 ]; then
+                rm -f $HOME/.gnupg/$i
+                ${WGET_CMD} -P $HOME/.gnupg $GSA/keys/$i
+                chmod 600 $HOME/.gnupg/$i
+            fi
+        done
+        # tell rpm to use gpg to sign
+        MACROS=$HOME/.rpmmacros
+        if ! $GREP '%_signature gpg' $MACROS 2>/dev/null; then
+            echo '%_signature gpg' >> $MACROS
         fi
-    done
-    # tell rpm to use gpg to sign
-    MACROS=$HOME/.rpmmacros
-    if ! $GREP '%_signature gpg' $MACROS 2>/dev/null; then
-        echo '%_signature gpg' >> $MACROS
-    fi
-    if ! $GREP '%_gpg_name' $MACROS 2>/dev/null; then
-        echo '%_gpg_name xCAT Security Key' >> $MACROS
-    fi
-    echo "Signing RPMs..."
-    build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
-    build-utils/rpmsign.exp $SRCDIR/*rpm | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
-    createrepo --checksum sha $DESTDIR            # specifying checksum so the repo will work on rhel5
-    createrepo --checksum sha $SRCDIR
-    rm -f $SRCDIR/repodata/repomd.xml.asc
-    rm -f $DESTDIR/repodata/repomd.xml.asc
-    gpg -a --detach-sign $DESTDIR/repodata/repomd.xml
-    gpg -a --detach-sign $SRCDIR/repodata/repomd.xml
-    if [ ! -f $DESTDIR/repodata/repomd.xml.key ]; then
-        ${WGET_CMD} -q -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
-    fi
-    if [ ! -f $SRCDIR/repodata/repomd.xml.key ]; then
-        ${WGET_CMD} -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
+        if ! $GREP '%_gpg_name' $MACROS 2>/dev/null; then
+            echo '%_gpg_name xCAT Security Key' >> $MACROS
+        fi
+        echo "Signing RPMs..."
+        build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
+        build-utils/rpmsign.exp $SRCDIR/*rpm | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
+        createrepo --checksum sha $DESTDIR            # specifying checksum so the repo will work on rhel5
+        createrepo --checksum sha $SRCDIR
+        rm -f $SRCDIR/repodata/repomd.xml.asc
+        rm -f $DESTDIR/repodata/repomd.xml.asc
+        gpg -a --detach-sign $DESTDIR/repodata/repomd.xml
+        gpg -a --detach-sign $SRCDIR/repodata/repomd.xml
+        if [ ! -f $DESTDIR/repodata/repomd.xml.key ]; then
+            ${WGET_CMD} -q -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
+        fi
+        if [ ! -f $SRCDIR/repodata/repomd.xml.key ]; then
+            ${WGET_CMD} -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
+        fi
+    else
+        createrepo --checksum sha $DESTDIR
+        createrepo --checksum sha $SRCDIR
     fi
-   else
-     createrepo --checksum sha $DESTDIR
-     createrepo --checksum sha $SRCDIR 
-   fi
 fi
 
 # set group and permissions correctly on the built rpms
@@ -455,7 +457,7 @@ chmod -R g+w $DESTDIR
 chgrp -R $SYSGRP $SRCDIR
 chmod -R g+w $SRCDIR
 
-else        # end of very long if-not-promote
+else        # end of very long if-not-promote ### @LINE193 ###
     # we are only promoting (not building)
     setversionvars
     setbranch
@@ -490,18 +492,18 @@ EOF
 #!/bin/sh
 cd `dirname $0`
 REPOFILE=`basename xCAT-*.repo`
-if [[ $REPOFILE == "xCAT-*.repo" ]]; then 
+if [ $REPOFILE = "xCAT-*.repo" ]; then
     echo "ERROR: For xcat-dep, please execute $0 in the correct <os>/<arch> subdirectory"
     exit 1
 fi
 #
 # default to RHEL yum, if doesn't exist try Zypper
 #
 DIRECTORY="/etc/yum.repos.d"
-if [[ ! -d ${DIRECTORY} ]]; then                                                                            
-    DIRECTORY="/etc/zypp/repos.d"                                                                           
+if [ ! -d "$DIRECTORY" ]; then
+    DIRECTORY="/etc/zypp/repos.d"
 fi
-sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > ${DIRECTORY}/$REPOFILE
+sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > "$DIRECTORY/$REPOFILE"
 cd -
 EOF2
 chmod 775 mklocalrepo.sh
@@ -521,6 +523,7 @@ fi
 #
 BUILDINFO=$XCATCORE/buildinfo
 echo "VERSION=$VER" > $BUILDINFO
+echo "RELEASE=$XCAT_RELEASE" >> $BUILDINFO
 echo "BUILD_TIME=$BUILD_TIME" >> $BUILDINFO
 echo "BUILD_MACHINE=$BUILD_MACHINE" >> $BUILDINFO
 echo "COMMIT_ID=$COMMIT_ID" >> $BUILDINFO
@@ -545,7 +548,7 @@ if [ -n "$UP" ] && [ "$UP" == 0 ]; then
 fi
 #else we will continue
 
-# Upload the individual RPMs to xcat.org 
+# Upload the individual RPMs to xcat.org
 if [ "$OSNAME" = "AIX" ]; then
     YUM=aix
 else
@@ -561,13 +564,13 @@ if [ "$REL" = "devel" -o "$PREGA" != 1 ]; then
     do : ; done
 fi
 
-# Upload the individual source RPMs to xcat.org 
+# Upload the individual source RPMs to xcat.org
 i=0
 echo "Uploading src RPMs from $SRCD to $YUMDIR/$YUM/$REL$EMBEDDIR/ ..."
 while [ $((i+=1)) -le 5 ] && ! rsync -urLv --delete $SRCD $USER@$SERVER:$YUMDIR/$YUM/$REL$EMBEDDIR/
 do : ; done
 
-# Upload the tarball to xcat.org 
+# Upload the tarball to xcat.org
 if [ "$PROMOTE" = 1 -a "$REL" != "devel" -a "$PREGA" != 1 ]; then
     # upload tarball to FRS area
     i=0

perl-xCAT/perl-xCAT.spec

@@ -1,7 +1,7 @@
 Summary: xCAT perl libraries
 Name: perl-xCAT
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 4
 License: EPL
 Group: System Environment/Libraries
@@ -17,8 +17,6 @@ BuildArch: noarch
 #Requires: perl-SOAP-Lite
 %endif
 
-Provides: perl-xCAT = %{epoch}:%{version}
-
 %description
 Provides perl xCAT libraries for core functionality.  Required for all xCAT installations.
 Includes xCAT::Table, xCAT::NodeRange, among others.

xCAT-IBMhpc/xCAT-IBMhpc.spec

@@ -1,7 +1,7 @@
 Summary: Install and configuration utilities for IBM HPC products in an xCAT cluster
 Name: xCAT-IBMhpc
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 4
 License: EPL
 Group: Applications/System
@@ -20,7 +20,7 @@ AutoReqProv: no
 # also need to fix Requires for AIX
 %ifos linux
 BuildArch: noarch
-#Requires: 
+#Requires:
 %endif
 
 Requires: perl-xCAT >= %{epoch}:%{version}
@@ -85,7 +85,3 @@ fi
 %post
 
 %preun
-
-
-
-

xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec

@@ -1,7 +1,7 @@
 Summary: Executables and data of the xCAT baremetal driver for OpenStack
 Name: xCAT-OpenStack-baremetal
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 4
 License: IBM
 Group: Applications/System

xCAT-OpenStack/xCAT-OpenStack.spec

@@ -1,7 +1,7 @@
-Summary: Meta-Metapackage for a common, default xCAT management node setup with OpenStack 
+Summary: Meta-Metapackage for a common, default xCAT management node setup with OpenStack
 Name: xCAT-OpenStack
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 License: EPL
 Group: Applications/System
 Vendor: IBM Corp.
@@ -16,8 +16,8 @@ Provides: xCAT-OpenStack = %{version}
 Requires: xCAT
 
 %description
-xCAT-OpenStack is an xCAT management node package intended for at-scale 
-management with OpenStack, including hardware management and software 
+xCAT-OpenStack is an xCAT management node package intended for at-scale
+management with OpenStack, including hardware management and software
 management.
 
 %prep
@@ -28,7 +28,6 @@ management.
 # Then convert the pods to man pages and html pages.
 ./db2man
 
-
 %install
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin
@@ -89,9 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 %ifos linux
   if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd  ]; then
-      /etc/init.d/xcatd restart 
+      /etc/init.d/xcatd restart
     fi
   fi
 %endif
 exit 0
-

xCAT-SoftLayer/xCAT-SoftLayer.spec

@@ -1,7 +1,7 @@
 Summary: Utilities to make xCAT work in a SoftLayer environment
 Name: xCAT-SoftLayer
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 4
 License: EPL
 Group: Applications/System

xCAT-UI/xCAT-UI.spec

@@ -1,12 +1,12 @@
 Summary: Web Client for xCAT 2
 Name: xCAT-UI
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
-Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
+Release: %{?release:%{release}}%{!?release:%(cat Release)}
 License: EPL
 Group: Applications/System
-URL: http://xcat.org
+URL: https://xcat.org/
 Packager: IBM
-Vendor: IBM
+Vendor: IBM Corp.
 
 Source: xCAT-UI-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root