fixes from Nathan to fix the rpm build script

security/svrcore/INSTALL

@@ -1,8 +1,11 @@
 Building:
 
-You first need to do the patch to fix the broken ../coreconf/location.mk:
-
-patch -p0 < corecore-location.patch
+You first need to do the patch to fix the broken ../coreconf/location.mk.  You must run the patch command from the top level directory.  If you checked out the code from CVS like this:
+ cvs co mozilla/security/coreconf mozilla/security/svrcore
+Then run patch as follows:
+ patch -p0 < mozilla/security/svrcore/corecore-location.patch
+Then
+ cd mozilla/security/svrcore ; make [args] ...
 
 This adds NSS_INCLUDE_DIR and NSS_LIB_DIR - if they are already there (i.e. someone fixed it) then patch will complain, but just ignore it.
 
@@ -69,8 +72,8 @@ I've put my nsinstall.exe in my $HOME/bin directory and put that first in my PAT
 
 * Building
 
-cd mozilla/security/svrcore
-patch -p0 < coreconf-location.patch
-make AR='link /lib -nologo -out:"$@"
+ patch -p0 < mozilla/security/svrcore/corecore-location.patch
+ cd mozilla/security/svrcore
+ make AR='link /lib -nologo -out:"$@"
 
 And that's it.  The svrcore.lib will be found in mozilla/dist/*.OBJ/lib and svrcore.h will be found in mozilla/dist/public/svrcore.  When you go to build the mozilla ldap c sdk that you have checked out into the same source tree, it will automatically find the files it needs when you use configure --with-svrcore ...

security/svrcore/build_svrcore-devel_rpm

@@ -63,19 +63,9 @@ fi
 # an 'i386' platform or an 'x86_64' platform!
 PLATFORM=`uname -i`
 if [ ${PLATFORM} = "i386" ]; then
-	# define NSS variables unique to this script
 	BITSIZE=32-bit
-	NSPR_BUILDTIME_DEPENDENCY="nspr-4.6-1.i386"
-	NSPR_DEVEL_BUILDTIME_DEPENDENCY="nspr-devel-4.6-1.i386"
-	NSS_BUILDTIME_DEPENDENCY="nss-3.11-1.i386"
-	NSS_DEVEL_BUILDTIME_DEPENDENCY="nss-devel-3.11-1.i386"
 elif [ ${PLATFORM} = "x86_64" ]; then
-	# define NSS variables unique to this script
 	BITSIZE=64-bit
-	NSPR_BUILDTIME_DEPENDENCY="nspr-4.6-1.x86_64"
-	NSPR_DEVEL_BUILDTIME_DEPENDENCY="nspr-devel-4.6-1.x86_64"
-	NSS_BUILDTIME_DEPENDENCY="nss-3.11-1.x86_64"
-	NSS_DEVEL_BUILDTIME_DEPENDENCY="nss-devel-3.11-1.x86_64"
 else
 	echo "The '$0' script is ONLY executable on either"
 	echo "an 'i386' platform or an 'x86_64' platform!"
@@ -88,48 +78,6 @@ unset LD_LIBRARY_PATH
 CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 export CVSROOT
 
-# Check Build Requirements:
-#
-# This script requires that the associated ${BITSIZE} NSPR
-# packages are installed on the system PRIOR to execution!
-#
-echo "Checking that ALL ${BITSIZE} Buildtime Dependencies are present . . ."
-BUILDTIME_DEPENDENCIES=0
-TOTAL_BUILDTIME_DEPENDENCIES=4
-RPM_PRESENCE=`rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' ${NSPR_BUILDTIME_DEPENDENCY}`
-if [ "${RPM_PRESENCE}" != "${NSPR_BUILDTIME_DEPENDENCY}" ]; then
-	echo "    Missing '${NSPR_BUILDTIME_DEPENDENCY}'!"
-else
-	echo "    Found '${NSPR_BUILDTIME_DEPENDENCY}'!"
-	BUILDTIME_DEPENDENCIES=`expr ${BUILDTIME_DEPENDENCIES} + 1`
-fi
-RPM_PRESENCE=`rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' ${NSPR_DEVEL_BUILDTIME_DEPENDENCY}`
-if [ "${RPM_PRESENCE}" != "${NSPR_DEVEL_BUILDTIME_DEPENDENCY}" ]; then
-	echo "    Missing '${NSPR_DEVEL_BUILDTIME_DEPENDENCY}'!"
-else
-	echo "    Found '${NSPR_DEVEL_BUILDTIME_DEPENDENCY}'!"
-	BUILDTIME_DEPENDENCIES=`expr ${BUILDTIME_DEPENDENCIES} + 1`
-fi
-RPM_PRESENCE=`rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' ${NSS_BUILDTIME_DEPENDENCY}`
-if [ "${RPM_PRESENCE}" != "${NSS_BUILDTIME_DEPENDENCY}" ]; then
-	echo "    Missing '${NSS_BUILDTIME_DEPENDENCY}'!"
-else
-	echo "    Found '${NSS_BUILDTIME_DEPENDENCY}'!"
-	BUILDTIME_DEPENDENCIES=`expr ${BUILDTIME_DEPENDENCIES} + 1`
-fi
-RPM_PRESENCE=`rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' ${NSS_DEVEL_BUILDTIME_DEPENDENCY}`
-if [ "${RPM_PRESENCE}" != "${NSS_DEVEL_BUILDTIME_DEPENDENCY}" ]; then
-	echo "    Missing '${NSS_DEVEL_BUILDTIME_DEPENDENCY}'!"
-else
-	echo "    Found '${NSS_DEVEL_BUILDTIME_DEPENDENCY}'!"
-	BUILDTIME_DEPENDENCIES=`expr ${BUILDTIME_DEPENDENCIES} + 1`
-fi
-if [ ${BUILDTIME_DEPENDENCIES} -ne ${TOTAL_BUILDTIME_DEPENDENCIES} ]; then
-	echo "Install ALL of the missing ${BITSIZE} Buildtime Dependencies before preceding!"
-	exit 255
-fi
-echo "Finished."
-
 # define the remaining variables
 PACKAGE=svrcore-devel
 VERSION=4.0.1
@@ -138,7 +86,7 @@ SVRCORE_TAG=SVRCORE_4_0_1_RTM
 SVRCORE_CORECONF_TAG=$SVRCORE_TAG
 PRJ=${PACKAGE}-${VERSION}
 RPM_HOME=`pwd`
-SPEC_FILENAME=${PACKAGE}.spec
+SPEC_FILENAME=svrcore.spec
 
 # define subroutines for this script
 usage() {
@@ -217,8 +165,8 @@ echo "Finished."
 # copy spec file
 cp ${SPEC_FILENAME} SPECS/${SPEC_FILENAME}
 
-# copy the SVRCORE source file template
-cp ${SVRCORE_TEMPLATE} SOURCES/${SVRCORE_TEMPLATE}
+# copy patches into SOURCES
+cp *.patch SOURCES/
 
 # build the ${BITSIZE} RPM and Source RPM
 echo "Executing ${BITSIZE} rpmbuild of ${SPEC_FILENAME} file . . . "

security/svrcore/coreconf-location.patch

@@ -1,20 +0,0 @@
---- ../coreconf/location.mk	21 Jul 2005 23:48:08 -0000	1.10
-+++ ../coreconf/location.mk	1 Feb 2006 22:01:10 -0000
-@@ -70,9 +70,17 @@
- ifdef NSPR_INCLUDE_DIR
-     INCLUDES += -I$(NSPR_INCLUDE_DIR)
- endif
- 
- ifndef NSPR_LIB_DIR
-     NSPR_LIB_DIR = $(DIST)/lib
- endif
- 
-+ifdef NSS_INCLUDE_DIR
-+    INCLUDES += -I$(NSS_INCLUDE_DIR)
-+endif
-+
-+ifndef NSS_LIB_DIR
-+    NSS_LIB_DIR = $(DIST)/lib
-+endif
-+
- MK_LOCATION = included