238319: Sun packages changes. NSS_3_10_BRANCH
authorchristophe.ravel.bugs%sun.com
Fri, 18 Nov 2005 22:09:04 +0000
branchNSS_3_10_BRANCH
changeset 6331 99f41d8f1ab21dfbf651a8a2664563a4cff2ad35
parent 6313 6fb1f3529c7c4fe63a58d955333e328691cf884e
child 6606 025aed9a4fce5e6f757fcc0180f6e1c05f2fc9f6
push idunknown
push userunknown
push dateunknown
bugs238319
238319: Sun packages changes. RPM_RELEASE can be set from the command line.
security/nss/pkg/linux/Makefile
--- a/security/nss/pkg/linux/Makefile
+++ b/security/nss/pkg/linux/Makefile
@@ -39,17 +39,19 @@
 # ***** END LICENSE BLOCK *****
 #
 #ident	"$Id$"
 #
 
 CORE_DEPTH = ../../..
 
 NAME        = sun-nss
-RELEASE     = 1
+ifndef RPM_RELEASE
+RPM_RELEASE = 1
+endif
 VERSION     = `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \
 		| sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
 PWD         = `pwd`
 BUILDROOT   = $(PWD)\/$(NAME)-root
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 publish:
@@ -71,17 +73,17 @@ publish:
 		| (mkdir -p opt/sun/private/include && cd opt/sun/private/include && tar xvfBp -)
 	rm -rf opt/sun/private/include/seccmd
 	rm -rf opt/sun/private/include/dbm
 
 	tar czvf $(NAME)-$(VERSION).tar.gz opt 
 	echo "%define _topdir `pwd`" >temp.spec
 	sed -e "s/NAME_REPLACE/$(NAME)/" \
 		-e "s/VERSION_REPLACE/$(VERSION)/" \
-		-e "s/RELEASE_REPLACE/$(RELEASE)/" \
+		-e "s/RELEASE_REPLACE/$(RPM_RELEASE)/" \
 	<$(NAME).spec >>temp.spec
 	echo "" >>temp.spec
 	echo "%files" >>temp.spec
 	echo "%defattr(-,root,root)" >>temp.spec
 	echo "%dir /opt" >>temp.spec
 	echo "%dir /opt/sun" >>temp.spec
 	echo "%dir /opt/sun/private" >>temp.spec
 	echo "%dir /opt/sun/private/lib" >>temp.spec