diff --git a/nsprpub/pkg/linux/Makefile.in b/nsprpub/pkg/linux/Makefile.in index ae1e55562be..1ffaf9c5145 100644 --- a/nsprpub/pkg/linux/Makefile.in +++ b/nsprpub/pkg/linux/Makefile.in @@ -38,7 +38,7 @@ # # ***** END LICENSE BLOCK ***** # -#ident "$Id: Makefile.in,v 1.9 2005-11-07 20:22:21 christophe.ravel.bugs%sun.com Exp $" +#ident "$Id: Makefile.in,v 1.10 2005-11-18 21:50:20 christophe.ravel.bugs%sun.com Exp $" # MOD_DEPTH = ../.. @@ -47,7 +47,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ NAME = sun-nspr -RELEASE = 2 +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/ .*//'` @@ -76,7 +78,7 @@ publish: 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) diff --git a/security/jss/pkg/linux/Makefile b/security/jss/pkg/linux/Makefile index 026a0e99f1a..c472445f63b 100644 --- a/security/jss/pkg/linux/Makefile +++ b/security/jss/pkg/linux/Makefile @@ -38,13 +38,15 @@ # # ***** END LICENSE BLOCK ***** # -#ident "$Id: Makefile,v 1.20 2005-11-07 20:19:05 christophe.ravel.bugs%sun.com Exp $" +#ident "$Id: Makefile,v 1.21 2005-11-18 21:52:41 christophe.ravel.bugs%sun.com Exp $" # CORE_DEPTH = ../../.. NAME = sun-jss -RELEASE = 1 +ifndef RPM_RELEASE +RPM_RELEASE = 1 +endif VERSION = `grep JSS_VERSION $(CORE_DEPTH)/jss/org/mozilla/jss/util/jssver.h \ | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'` PWD = `pwd` @@ -90,7 +92,7 @@ endif 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 diff --git a/security/nss/pkg/linux/Makefile b/security/nss/pkg/linux/Makefile index fb75f297a6b..d058354f6f7 100644 --- a/security/nss/pkg/linux/Makefile +++ b/security/nss/pkg/linux/Makefile @@ -38,13 +38,15 @@ # # ***** END LICENSE BLOCK ***** # -#ident "$Id: Makefile,v 1.14 2005-11-07 20:20:10 christophe.ravel.bugs%sun.com Exp $" +#ident "$Id: Makefile,v 1.15 2005-11-18 21:51:42 christophe.ravel.bugs%sun.com Exp $" # CORE_DEPTH = ../../.. NAME = sun-nss -RELEASE = 2 +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` @@ -85,7 +87,7 @@ publish: 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