[Aplaws-commit] r127 - tools/trunk/scripts/bin

[<ssk...@re...>]

Author: sskracic
Date: 2004-11-24 18:46:31 +0100 (Wed, 24 Nov 2004)
New Revision: 127

Modified:
   tools/trunk/scripts/bin/env-conf.sh
Log:
  In transition from shell to perl-based make-rpm utility,
compatibility layer of env variables needed to properly build
5x and 6.0 RPMS got lost somehow.  Fixed.


Modified: tools/trunk/scripts/bin/env-conf.sh
===================================================================
--- tools/trunk/scripts/bin/env-conf.sh	2004-11-24 16:42:35 UTC (rev 126)
+++ tools/trunk/scripts/bin/env-conf.sh	2004-11-24 17:46:31 UTC (rev 127)
@@ -26,6 +26,22 @@
     exit 1
 fi
 
+#######################################################################
+#
+#  Compatibility vars for 5.x and 6.0 RPMs
+#
+PKGVERSION="$CCM_PKGVERSION"
+CCMTYPE="$CCM_TYPE"
+PROJECT="$CCM_PROJECT"
+REQUIRES="$CCM_REQUIRES"
+RPM_DEPENDENCIES="$CCM_RPM_DEPENDENCIES"
+NAME="$CCM_APP"
+PACKAGE="$CCM_PACKAGE"
+PRETTYNAME="$CCM_PRETTYNAME"
+VERSION="$CCM_VERSION"
+RELEASE="$CCM_RELEASE"
+export PKGVERSION CCMTYPE PROJECT REQUIRES RPM_DEPENDENCIES NAME PACKAGE PRETTYNAME VERSION RELEASE
+
 echo "CCM_PACKAGE:    $CCM_PACKAGE"
 echo "CCM_VERSION:    $CCM_VERSION"
 echo "CCM_RELEASE:    $CCM_RELEASE"
@@ -53,6 +69,7 @@
 echo "  CCM_INST_WEBAPP_DIRNAME: $CCM_INST_WEBAPP_DIRNAME"
 echo "  CCM_PACKAGE_NAME: $CCM_PACKAGE_NAME"
 echo "  CCM_ROOT_DIR: $CCM_ROOT_DIR"
+echo "  CCM_SCRIPTS_COMPAT: $CCM_SCRIPTS_COMPAT"
 echo "  CCM_SRC_DIR: $CCM_SRC_DIR"
 echo "  CLASSPATH: $CLASSPATH"