238319: Sun packages changes.NSPR_4_6_BASE

Fix packages on Linux. List of files is now generated for sun-nspr.spec.

2 files changed, 22 insertions, 74 deletions

diff --git a/pkg/linux/Makefile.in b/pkg/linux/Makefile.in
index 1d9d97af..c2ef7e89 100644
--- a/pkg/linux/Makefile.in
+++ b/pkg/linux/Makefile.in
@@ -67,10 +67,12 @@ endif
 publish:
 	$(MAKE) clean
 	mkdir -p SOURCES SRPMS RPMS BUILD
-	(cd $(dist_libdir) && tar cphf - .) \
+	(cd $(dist_libdir) && tar cphf - libnspr4.so libplds4.so libplc4.so) \
 	| (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)
@@ -79,6 +81,25 @@ publish:
 	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)
+	echo "%dir /opt/sun" >>$(SPECFILE)
+	echo "%dir /opt/sun/private" >>$(SPECFILE)
+	echo "%dir /opt/sun/private/$(RPMLIBDIR)" >>$(SPECFILE)
+	find opt \( -name "*.so" \) | sed -e "s-^-/-" >>$(SPECFILE)
+	echo "" >>$(SPECFILE)
+	echo "%files devel" >>$(SPECFILE)
+	echo "%defattr(-,root,root)" >>$(SPECFILE)
+	echo "%dir /opt" >>$(SPECFILE)
+	echo "%dir /opt/sun" >>$(SPECFILE)
+	echo "%dir /opt/sun/private" >>$(SPECFILE)
+	echo "%dir /opt/sun/private/include" >>$(SPECFILE)
+	echo "%dir /opt/sun/private/include/nspr" >>$(SPECFILE)
+	echo "%dir /opt/sun/private/include/nspr/obsolete" >>$(SPECFILE)
+	find opt -type f \( -name "*.h" \) \
+		| sed -e "s-^-/-" >>$(SPECFILE)
 	rpmbuild $(RPMTARGET) -bb $(SPECFILE)
 
 clean:
diff --git a/pkg/linux/sun-nspr.spec b/pkg/linux/sun-nspr.spec
index 6006f4b2..f914736d 100644
--- a/pkg/linux/sun-nspr.spec
+++ b/pkg/linux/sun-nspr.spec
@@ -79,76 +79,3 @@ tar xvzf $RPM_SOURCE_DIR/%{name}-%{version}.tar.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir /opt
-%dir /opt/sun
-%dir /opt/sun/private
-%dir /opt/sun/private/lib
-/opt/sun/private/lib/libnspr4.so
-/opt/sun/private/lib/libplc4.so
-/opt/sun/private/lib/libplds4.so
-
-%files devel
-%defattr(-,root,root)
-%dir /opt
-%dir /opt/sun
-%dir /opt/sun/private
-%dir /opt/sun/private/include
-%dir /opt/sun/private/include/nspr
-%dir /opt/sun/private/include/nspr/obsolete
-/opt/sun/private/include/nspr/prcpucfg.h
-/opt/sun/private/include/nspr/obsolete/protypes.h
-/opt/sun/private/include/nspr/nspr.h
-/opt/sun/private/include/nspr/pratom.h
-/opt/sun/private/include/nspr/prbit.h
-/opt/sun/private/include/nspr/prclist.h
-/opt/sun/private/include/nspr/prcmon.h
-/opt/sun/private/include/nspr/prcountr.h
-/opt/sun/private/include/nspr/prcvar.h
-/opt/sun/private/include/nspr/prdtoa.h
-/opt/sun/private/include/nspr/prenv.h
-/opt/sun/private/include/nspr/prerr.h
-/opt/sun/private/include/nspr/prerror.h
-/opt/sun/private/include/nspr/prinet.h
-/opt/sun/private/include/nspr/prinit.h
-/opt/sun/private/include/nspr/prinrval.h
-/opt/sun/private/include/nspr/prio.h
-/opt/sun/private/include/nspr/pripcsem.h
-/opt/sun/private/include/nspr/prlink.h
-/opt/sun/private/include/nspr/prlock.h
-/opt/sun/private/include/nspr/prlog.h
-/opt/sun/private/include/nspr/prlong.h
-/opt/sun/private/include/nspr/prmem.h
-/opt/sun/private/include/nspr/prmon.h
-/opt/sun/private/include/nspr/prmwait.h
-/opt/sun/private/include/nspr/prnetdb.h
-/opt/sun/private/include/nspr/prolock.h
-/opt/sun/private/include/nspr/prpdce.h
-/opt/sun/private/include/nspr/prprf.h
-/opt/sun/private/include/nspr/prproces.h
-/opt/sun/private/include/nspr/prrng.h
-/opt/sun/private/include/nspr/prrwlock.h
-/opt/sun/private/include/nspr/prshma.h
-/opt/sun/private/include/nspr/prshm.h
-/opt/sun/private/include/nspr/prsystem.h
-/opt/sun/private/include/nspr/prthread.h
-/opt/sun/private/include/nspr/prtime.h
-/opt/sun/private/include/nspr/prtpool.h
-/opt/sun/private/include/nspr/prtrace.h
-/opt/sun/private/include/nspr/prtypes.h
-/opt/sun/private/include/nspr/prvrsion.h
-/opt/sun/private/include/nspr/prwin16.h
-/opt/sun/private/include/nspr/plarenas.h
-/opt/sun/private/include/nspr/plarena.h
-/opt/sun/private/include/nspr/plhash.h
-/opt/sun/private/include/nspr/plbase64.h
-/opt/sun/private/include/nspr/plerror.h
-/opt/sun/private/include/nspr/plgetopt.h
-/opt/sun/private/include/nspr/plresolv.h
-/opt/sun/private/include/nspr/plstr.h
-
-%changelog
-* Sat Jan 18 2003 Kirk Erickson <kirk.erickson@sun.com>
-- http://bugzilla.mozilla.org/show_bug.cgi?id=189501