238319: Sun packages changes. NSPR_4_6_BRANCH NSPR_4_6_1_RC1 NSPR_4_6_1_RTM
authorchristophe.ravel.bugs%sun.com
Fri, 18 Nov 2005 21:54:17 +0000
branchNSPR_4_6_BRANCH
changeset 3499 61cad9e33dc189a0843c606e29a3df75bca9faba
parent 3483 375f26295097016ecf25bec5a9e21a6cf576dca3
child 3515 f880a118573c0fb6dd748bee8a83ecf6aa9c9d8c
push idunknown
push userunknown
push dateunknown
bugs238319
238319: Sun packages changes. RPM_RELEASE can be set from the command line.
pkg/linux/Makefile.in
--- a/pkg/linux/Makefile.in
+++ b/pkg/linux/Makefile.in
@@ -42,17 +42,19 @@
 #
 
 MOD_DEPTH = ../..
 topsrcdir   = @top_srcdir@
 srcdir	    = @srcdir@
 VPATH	    = @srcdir@
 
 NAME        = sun-nspr
-RELEASE     = 1
+ifndef RPM_RELEASE
+RPM_RELEASE = 1
+endif
 TOPDIR      = /usr/src/redhat
 VERSION     = `grep PR_VERSION $(dist_includedir)/prinit.h \
                   | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
 
 SPECFILE    = $(NAME).spec
 
 include $(MOD_DEPTH)/config/autoconf.mk
 
@@ -71,17 +73,17 @@ publish:
 	| (mkdir -p opt/sun/private/$(RPMLIBDIR) && cd opt/sun/private/$(RPMLIBDIR) && tar xvfBp -)
 	(cd $(dist_includedir) && tar cphf - .) \
 	| (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -)
 	(cd opt/sun/private/include/nspr && \
 		rm -rf md private obsolete/pralarm.h obsolete/probslet.h obsolete/prsem.h)
 	tar czvf SOURCES/$(NAME)-$(VERSION).tar.gz opt
 	echo "%define name $(NAME)" >$(SPECFILE)
 	echo "%define version $(VERSION)" >>$(SPECFILE)
-	echo "%define release $(RELEASE)" >>$(SPECFILE)
+	echo "%define release $(RPM_RELEASE)" >>$(SPECFILE)
 	echo "%define buildroot `pwd`/$(NAME)-root" >>$(SPECFILE)
 	echo "%define _topdir `pwd`" >>$(SPECFILE)
 	echo "%define _unpackaged_files_terminate_build 0" >>$(SPECFILE)
 	cat $(srcdir)/$(NAME).spec >>$(SPECFILE)
 	echo "" >>$(SPECFILE)
 	echo "%files" >>$(SPECFILE)
 	echo "%defattr(-,root,root)" >>$(SPECFILE)
 	echo "%dir /opt" >>$(SPECFILE)