238319: Sun packages changes. NSPR_4_5_BRANCH
authorchristophe.ravel.bugs%sun.com
Fri, 18 Nov 2005 22:07:55 +0000
branchNSPR_4_5_BRANCH
changeset 3500 ef76d7dd49ec82585a819e3b9ef2d81748c3072d
parent 3359 7f304b049faa74271b9fb32916cce947dae6cb5b
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
@@ -6,17 +6,19 @@
 #
 
 MOD_DEPTH = ../..
 topsrcdir   = @top_srcdir@
 srcdir	    = @srcdir@
 VPATH	    = @srcdir@
 
 NAME        = sun-nspr
-RELEASE     = 5
+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
 
@@ -25,17 +27,17 @@ publish:
 	mkdir -p SOURCES SRPMS RPMS BUILD
 	(cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/lib && tar cphf - .) \
 	| (mkdir -p opt/sun/private/lib && cd opt/sun/private/lib && tar xvfBp -)
 	(cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/include && tar cphf - .) \
 	| (mkdir -p opt/sun/private/include/nspr && cd opt/sun/private/include/nspr && tar xvfBp -)
 	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)
 	cat $(srcdir)/$(NAME).spec >>$(SPECFILE)
 	rpm -ba $(SPECFILE)
 
 clean:
 	rm -rf $(TOPDIR)/BUILD/$(NAME)
 	rm -rf SOURCES SRPMS RPMS BUILD