From 1ad56bbc2a926b6fe72bd9e5a876280f9d3acb44 Mon Sep 17 00:00:00 2001
From: "christophe.ravel.bugs%sun.com" <christophe.ravel.bugs%sun.com>
Date: Fri, 22 Jul 2005 15:32:50 +0000
Subject: [PATCH] 238319: Sun packages changes Change rpm packaging for RHEL3
 i386 and x86_64.

---
 nsprpub/pkg/linux/Makefile.in       | 14 ++++++++++----
 security/jss/pkg/linux/Makefile     |  9 +++++++--
 security/jss/pkg/linux/sun-jss.spec |  2 ++
 security/nss/pkg/linux/Makefile     |  9 +++++++--
 security/nss/pkg/linux/sun-nss.spec |  2 ++
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/nsprpub/pkg/linux/Makefile.in b/nsprpub/pkg/linux/Makefile.in
index 451979a4d37..531c4c748eb 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.5 2005-06-01 20:51:33 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile.in,v 1.6 2005-07-22 15:32:39 christophe.ravel.bugs%sun.com Exp $"
 #
 
 MOD_DEPTH = ../..
@@ -56,12 +56,17 @@ SPECFILE    = $(NAME).spec
 
 include $(MOD_DEPTH)/config/autoconf.mk
 
+# Force i386 for non 64 bit build
+ifneq ($(USE_64),1)
+	RPMTARGET = "--target=i386"
+endif
+
 publish:
 	$(MAKE) clean
 	mkdir -p SOURCES SRPMS RPMS BUILD
-	(cd $(MOD_DEPTH)/../../dist/$(RELEASE_OBJDIR_NAME)/lib && tar cphf - .) \
+	(cd $(dist_libdir) && 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 - .) \
+	(cd $(dist_includedir) && 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)
@@ -69,8 +74,9 @@ publish:
 	echo "%define release $(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)
-	rpm -ba $(SPECFILE)
+	rpmbuild $(RPMTARGET) -bb $(SPECFILE)
 
 clean:
 	rm -rf $(TOPDIR)/BUILD/$(NAME)
diff --git a/security/jss/pkg/linux/Makefile b/security/jss/pkg/linux/Makefile
index 879880c2f93..803f4a6f3b2 100644
--- a/security/jss/pkg/linux/Makefile
+++ b/security/jss/pkg/linux/Makefile
@@ -38,7 +38,7 @@
 #
 # ***** END LICENSE BLOCK *****
 #
-#ident	"$Id: Makefile,v 1.17 2005-04-27 20:28:26 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile,v 1.18 2005-07-22 15:32:49 christophe.ravel.bugs%sun.com Exp $"
 #
 
 CORE_DEPTH = ../../..
@@ -52,6 +52,11 @@ BUILDROOT   = $(PWD)\/$(NAME)-root
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
+# Force i386 for non 64 bit build
+ifneq ($(USE_64),1)
+	RPMTARGET = "--target=i386"
+endif
+
 publish:
 	$(MAKE) clean
 	mkdir -p SOURCES SRPMS RPMS BUILD
@@ -101,7 +106,7 @@ endif
 	find opt -type f ! \( -name "*.so" -o -name "*.jar" \) \
 		| sed -e "s-^-/-" >>temp.spec
 	cp $(NAME)-$(VERSION).tar.gz SOURCES
-	rpm -ba temp.spec
+	rpmbuild $(RPMTARGET) -bb temp.spec
 
 clean::
 	rm -rf SOURCES SRPMS RPMS BUILD
diff --git a/security/jss/pkg/linux/sun-jss.spec b/security/jss/pkg/linux/sun-jss.spec
index ef789e5d093..db146990571 100644
--- a/security/jss/pkg/linux/sun-jss.spec
+++ b/security/jss/pkg/linux/sun-jss.spec
@@ -62,6 +62,8 @@ Summary: Development Libraries for Network Security Services for Java
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
+%define _unpackaged_files_terminate_build 0
+
 %description devel
 Header files for doing development with Network Security Services for Java.
 
diff --git a/security/nss/pkg/linux/Makefile b/security/nss/pkg/linux/Makefile
index 9100f58c9a5..678aaf45a7e 100644
--- a/security/nss/pkg/linux/Makefile
+++ b/security/nss/pkg/linux/Makefile
@@ -38,7 +38,7 @@
 #
 # ***** END LICENSE BLOCK *****
 #
-#ident	"$Id: Makefile,v 1.11 2005-06-27 18:22:02 christophe.ravel.bugs%sun.com Exp $"
+#ident	"$Id: Makefile,v 1.12 2005-07-22 15:32:50 christophe.ravel.bugs%sun.com Exp $"
 #
 
 CORE_DEPTH = ../../..
@@ -52,6 +52,11 @@ BUILDROOT   = $(PWD)\/$(NAME)-root
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
+# Force i386 for non 64 bit build
+ifneq ($(USE_64),1)
+	RPMTARGET = "--target=i386"
+endif
+
 publish:
 	$(MAKE) clean
 	mkdir -p SOURCES SRPMS RPMS BUILD
@@ -99,7 +104,7 @@ publish:
 	find opt -type f \( -name "*.h" \) \
 		| sed -e "s-^-/-" >>temp.spec
 	cp $(NAME)-$(VERSION).tar.gz SOURCES
-	rpm -ba temp.spec
+	rpmbuild $(RPMTARGET) -bb temp.spec
 
 clean::
 	rm -rf SOURCES SRPMS RPMS BUILD
diff --git a/security/nss/pkg/linux/sun-nss.spec b/security/nss/pkg/linux/sun-nss.spec
index 5660761d4f7..13b5b26dbad 100644
--- a/security/nss/pkg/linux/sun-nss.spec
+++ b/security/nss/pkg/linux/sun-nss.spec
@@ -62,6 +62,8 @@ Summary: Development Libraries for Network Security Services
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
+%define _unpackaged_files_terminate_build 0
+
 %description devel
 Header files for doing development with Network Security Services.