Resolves bug 189504 (Build Linux RPMS).

security/nss/Makefile

@@ -164,10 +164,5 @@ endif
 
 nss_RelEng_bld: build_coreconf import all
 
-ifeq ($(OS_ARCH),SunOS)
+package:
-solarispkg:
+	$(MAKE) -C pkg publish
-	@echo Making Solaris packages.
-	rm -rf pkg/$(OBJDIR)
-	cp -r pkg/solaris pkg/$(OBJDIR)
-	$(MAKE) -C pkg/$(OBJDIR) publish
-endif

security/nss/pkg/Makefile

@@ -0,0 +1,55 @@
+#! gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+CORE_DEPTH = ../..
+DEPTH      = ../..
+
+include $(CORE_DEPTH)/coreconf/config.mk
+
+publish:
+ifeq ($(OS_TARGET),Linux)
+	rm -rf $(OBJDIR)
+	cp -r linux $(OBJDIR)
+	$(MAKE) -C $(OBJDIR) publish
+endif
+ifeq ($(OS_TARGET),SunOS)
+	rm -rf $(OBJDIR)
+	cp -r solaris $(OBJDIR)
+	$(MAKE) -C $(OBJDIR) publish
+endif
+
+clean::
+	rm -rf $(OBJDIR)
+
+include $(CORE_DEPTH)/coreconf/rules.mk

security/nss/pkg/linux/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"$Id: Makefile,v 1.1 2003-02-07 05:56:14 kirk.erickson%sun.com Exp $"
+#
+
+CORE_DEPTH = ../../..
+
+NAME        = sun-nss
+RELEASE     = 1
+TOPDIR      = /usr/src/redhat
+VERSION     = `grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h \
+				| sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
+
+include $(CORE_DEPTH)/coreconf/config.mk
+include $(CORE_DEPTH)/coreconf/rules.mk
+
+publish:
+	$(MAKE) clean
+	mkdir -p usr/lib/mps
+	find $(CORE_DEPTH)/../dist/$(OBJDIR)/lib -type l \
+		\( -name "*.so" -o -name "*.chk" \) \
+		-exec cp -L {} usr/lib/mps \;
+	mkdir -p usr/include/mps
+	cp -Lr $(CORE_DEPTH)/../dist/public/* usr/include/mps
+	tar czvf $(NAME)-$(VERSION).tar.gz usr
+	sed -e "s/NAME_REPLACE/$(NAME)/" \
+		-e "s/VERSION_REPLACE/$(VERSION)/" \
+		-e "s/RELEASE_REPLACE/$(RELEASE)/" \
+	<$(NAME).spec >temp.spec
+	echo "" >>temp.spec
+	echo "%files" >>temp.spec
+	echo "%defattr(-,root,root)" >>temp.spec
+	echo "%dir /usr" >>temp.spec
+	echo "%dir /usr/lib" >>temp.spec
+	echo "%dir /usr/lib/mps" >>temp.spec
+	find usr \( -name "*.so" -o -name "*.chk" \) \
+		| sed -e "s-^-/-" >>temp.spec
+	echo "" >>temp.spec
+	echo "%files devel" >>temp.spec
+	echo "%defattr(-,root,root)" >>temp.spec
+	find usr -type d | sed -e "s-^-%dir /-" >>temp.spec
+	find usr -type f ! \( -name "*.so" -o -name "*.chk" \) \
+		| sed -e "s-^-/-" >>temp.spec
+	cp $(NAME)-$(VERSION).tar.gz $(TOPDIR)/SOURCES
+	rpm -ba temp.spec
+	if [ ! -d RPMS ] ; then mkdir -p RPMS ; fi
+	if [ ! -d SRPMS ] ; then mkdir -p SRPMS ; fi
+	cp -v $(TOPDIR)/RPMS/i386/$(NAME)-$(VERSION)-* RPMS
+	cp -v $(TOPDIR)/RPMS/i386/$(NAME)-devel-$(VERSION)-* RPMS
+	cp -v $(TOPDIR)/SRPMS/$(NAME)-$(VERSION)-* SRPMS
+
+clean::
+	rm -rf $(TOPDIR)/BUILD/$(NAME)
+	rm -rf RPMS SRPMS usr
+	rm -f temp.spec
+	rm -f $(NAME)-$(VERSION).tar.gz

security/nss/pkg/linux/sun-nss.spec

@@ -0,0 +1,41 @@
+Summary: Network Security Services
+Name: NAME_REPLACE
+Vendor: Sun Microsystems
+Version: VERSION_REPLACE
+Release: RELEASE_REPLACE
+Copyright: MPL
+Group: System Environment/Base
+Source: %{name}-%{version}.tar.gz
+ExclusiveOS: Linux
+BuildRoot: /var/tmp/%{name}-root
+Requires: sun-nspr >= 4.3
+        
+%description
+Network Security Services (NSS) is a set of libraries designed
+to support cross-platform development of security-enabled server
+applications. Applications built with NSS can support SSL v2
+and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME,
+X.509 v3 certificates, and other security standards.  See:
+http://www.mozilla.org/projects/security/pki/nss/overview.html
+
+%package devel
+Summary: Development Libraries for Network Security Services
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header files for doing development with Network Security Services.
+
+%prep
+%setup -c
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT
+tar xvzf $RPM_SOURCE_DIR/%{name}-%{version}.tar.gz
+
+%clean
+rm -rf $RPM_BUILD_ROOT