SPECS: js.spec - merged from DEVEL

qboosh qboosh at pld-linux.org
Sat Dec 1 01:21:52 CET 2007 

Author: qboosh                       Date: Sat Dec  1 00:21:52 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   js.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/js.spec
diff -u SPECS/js.spec:1.46 SPECS/js.spec:1.47
--- SPECS/js.spec:1.46	Tue Feb 13 20:59:02 2007
+++ SPECS/js.spec	Sat Dec  1 01:21:46 2007
@@ -2,9 +2,9 @@
 #
 # Conditional build:
 %bcond_without	threads	# thread-safe library (requires nspr)
-%bcond_with	java	# libjsj and lshell
+%bcond_without	java	# libjsj and lshell
 #
-%ifarch i386 i486 ppc ppc64
+%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
 %undefine	with_java
 %endif
 #
@@ -12,14 +12,15 @@
 Summary:	JavaScript Reference Implementation
 Summary(pl.UTF-8):	Wzorcowa implementacja JavaScriptu
 Name:		js
-Version:	1.60
-Release:	4
-Epoch:		1
-License:	GPL or Netscape Public License 1.1
+Version:	1.7.0
+Release:	1
+Epoch:		2
+License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/js/%{name}-%{version}.tar.gz
-# Source0-md5:	bd8f021e43a8fbbec55ac2cd3d483243
+# Source0-md5:	5571134c3863686b623ebe4e6b1f6fe6
 Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-java.patch
 URL:		http://www.mozilla.org/js/
 %{?with_java:BuildRequires:	jdk}
 %{?with_java:BuildRequires:	jpackage-utils}
@@ -28,6 +29,8 @@
 BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.294
+# dead, removed upstream
+Obsoletes:	perl-JS
 Conflicts:	njs
 %{?with_threads:Provides:	js(threads)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,24 +132,13 @@
 %description java-static -l pl.UTF-8
 Biblioteka statyczna implementacji JavaScript LiveConnect 3.
 
-%package -n perl-JS
-Summary:	JS Perl module - interface to JavaScript
-Summary(pl.UTF-8):	Moduł Perla JS - interfejs do JavaScriptu
-Group:		Development/Languages/Perl
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description -n perl-JS
-JS Perl module allows calling JavaScript from Perl.
-
-%description -n perl-JS -l pl.UTF-8
-Moduł Perla JS pozwalający na wywoływanie JavaScriptu z Perla.
-
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
-echo 'SONAME=libjs.so.0' >> src/Makefile.ref
-echo 'SONAME=libjsj.so.0' >> src/liveconnect/Makefile.ref
+echo 'SONAME=libjs.so.1' >> src/Makefile.ref
+echo 'SONAME=libjsj.so.1' >> src/liveconnect/Makefile.ref
 
 %build
 %{__make} -j1 -C src -f Makefile.ref \
@@ -159,17 +151,6 @@
 	%{?with_threads:JS_THREADSAFE=1} \
 	%{?with_java:JS_LIVECONNECT=1 JDK=%{java_home}}
 
-# js segfaults when jsperl is compiled in
-#	JS_PERLCONNECT=1
-
-cd src/perlconnect
-%{!?debug:BUILD_OPT=1} \
-%{__perl} Makefile.PL \
-	INSTALLDIRS=vendor
-
-%{__make} \
-	OPTIMIZE="%{rpmcflags}"
-
 # no UNIX makefiles
 # %{__make} -C jsd
 
@@ -180,33 +161,29 @@
 cd src
 install Linux*/{js,jscpucfg} $RPM_BUILD_ROOT%{_bindir}
 install Linux*/libjs.a $RPM_BUILD_ROOT%{_libdir}
-install Linux*/libjs.so $RPM_BUILD_ROOT%{_libdir}/libjs.so.0.1.0
-ln -sf libjs.so.0.1.0 $RPM_BUILD_ROOT%{_libdir}/libjs.so
-install Linux*/jsautocfg.h $RPM_BUILD_ROOT%{_includedir}/js
+install Linux*/libjs.so $RPM_BUILD_ROOT%{_libdir}/libjs.so.1.0.0
+ln -sf libjs.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjs.so.1
+ln -sf libjs.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjs.so
+install Linux*/{jsautocfg.h,jsautokw.h} $RPM_BUILD_ROOT%{_includedir}/js
 install js.msg jsapi.h jsarray.h jsarena.h jsatom.h jsbit.h jsbool.h \
 	jsclist.h jscntxt.h jscompat.h jsconfig.h jsdate.h jsdbgapi.h \
-	jsdhash.h jsemit.h jsfun.h jsgc.h jshash.h jsinterp.h jslock.h \
-	jslong.h jsmath.h jsnum.h jsobj.h jsopcode.tbl jsopcode.h jsosdep.h \
-	jsotypes.h jsparse.h jsprf.h jsprvtd.h jspubtd.h jsregexp.h jsscan.h \
-	jsscope.h jsscript.h jsstr.h jstypes.h jsutil.h jsxdrapi.h jsstddef.h \
+	jsdhash.h jsemit.h jsfun.h jsgc.h jshash.h jsinterp.h jsiter.h \
+	jslock.h jslong.h jsmath.h jsnum.h jsobj.h jsopcode.tbl jsopcode.h \
+	jsosdep.h jsotypes.h jsparse.h jsprf.h jsproto.tbl jsprvtd.h jspubtd.h \
+	jsregexp.h jsscan.h jsscope.h jsscript.h jsstddef.h jsstr.h jstypes.h \
+	jsutil.h jsxdrapi.h jsxml.h \
 	$RPM_BUILD_ROOT%{_includedir}/js
 
 %if %{with java}
 install liveconnect/Linux*/libjsj.a $RPM_BUILD_ROOT%{_libdir}
-install liveconnect/Linux*/libjsj.so $RPM_BUILD_ROOT%{_libdir}/libjsj.so.0.1.0
-ln -sf libjsj.so.0.1.0 $RPM_BUILD_ROOT%{_libdir}/libjsj.so
+install liveconnect/Linux*/libjsj.so $RPM_BUILD_ROOT%{_libdir}/libjsj.so.1.0.0
+ln -sf libjsj.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjsj.so.1
+ln -sf libjsj.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libjsj.so
 install liveconnect/Linux*/lcshell $RPM_BUILD_ROOT%{_bindir}
 install liveconnect/classes/Linux*/*.jar $RPM_BUILD_ROOT%{classdir}
 install liveconnect/{jsjava.h,nsI*.h,_jni/*.h} $RPM_BUILD_ROOT%{_includedir}/js
 %endif
 
-%{__make} -C perlconnect pure_install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-cp -f perlconnect/README.html README-perlconnect.html
-
-/sbin/ldconfig -n -N $RPM_BUILD_ROOT%{_libdir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -218,10 +195,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc src/README*.html
+%doc src/README.html
 %attr(755,root,root) %{_bindir}/js*
 %attr(755,root,root) %{_libdir}/libjs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjs.so.0
+%attr(755,root,root) %ghost %{_libdir}/libjs.so.1
 
 %files devel
 %defattr(644,root,root,755)
@@ -229,6 +206,7 @@
 %dir %{_includedir}/js
 %{_includedir}/js/js.msg
 %{_includedir}/js/jsopcode.tbl
+%{_includedir}/js/jsproto.tbl
 %{_includedir}/js/js[!j]*.h
 
 %files static
@@ -241,8 +219,8 @@
 %doc src/liveconnect/README.html
 %attr(755,root,root) %{_bindir}/lcshell
 %attr(755,root,root) %{_libdir}/libjsj.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjsj.so.0
-%{classdir}/*.jar
+%attr(755,root,root) %ghost %{_libdir}/libjsj.so.1
+%{classdir}/js*.jar
 
 %files java-devel
 %defattr(644,root,root,755)
@@ -255,22 +233,26 @@
 %{_libdir}/libjsj.a
 %endif
 
-%files -n perl-JS
-%defattr(644,root,root,755)
-%{perl_vendorarch}/JS.pm
-%{perl_vendorarch}/jsperlbuild.pl
-%dir %{perl_vendorarch}/auto/JS
-%{perl_vendorarch}/auto/JS/JS.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/JS/JS.so
-# unusable now (helper module for PerlConnect in libjs, which is not built)
-#%%{perl_vendorarch}/PerlConnect.pm
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2007-12-01 00:21:46  qboosh
+- merged from DEVEL
+
+Revision 1.46.2.2  2007-12-01 00:13:09  qboosh
+- ABI has changed - so changed sonames to .so.1
+- package missing headers
+- build java parts by default (where possible)
+
+Revision 1.46.2.1  2007-11-25 21:08:33  qboosh
+- updated to 1.7.0 (versioning scheme changed, Epoch 2)
+- updated makefile patch, added java patch to build with JDK 1.6
+- perlconnect (and thus perl-JS package) dropped upstream
+- DEVEL branch, because upgrade causes elinks to crash immediately
+
 Revision 1.46  2007-02-13 19:59:02  qboosh
 - updated bcond descs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/js.spec?r1=1.46&r2=1.47&f=u

More information about the pld-cvs-commit mailing list