rpms/js/devel js-1.5-threadsafe.patch,NONE,1.1 js.spec,1.11,1.12

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19867

Modified Files:
	js.spec 
Added Files:
	js-1.5-threadsafe.patch 
Log Message:
Enable JS_THREADSAFE in the build (#199696), add patch and nspr build req.


js-1.5-threadsafe.patch:

--- NEW FILE js-1.5-threadsafe.patch ---
diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
--- js.orig/src/Makefile.ref	2003-11-15 01:10:55.000000000 +0100
+++ js/src/Makefile.ref	2006-07-24 17:06:59.000000000 +0200
@@ -61,11 +61,11 @@ endif
 
 ifdef JS_THREADSAFE
 DEFINES += -DJS_THREADSAFE
-INCLUDES += -I../../dist/$(OBJDIR)/include
+INCLUDES += $(shell nspr-config --cflags)
 ifdef USE_MSVC
 OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
 else
-OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr${NSPR_LIBSUFFIX}
+OTHER_LIBS += $(shell nspr-config --libs)
 endif
 endif
 


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- js.spec	6 Mar 2006 15:31:18 -0000	1.11
+++ js.spec	24 Jul 2006 15:31:34 -0000	1.12
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -16,9 +16,10 @@
 Patch1: js-shlib.patch
 Patch2: js-1.5-va_copy.patch
 Patch3: js-ldflags.patch
+Patch4: js-1.5-threadsafe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl >= 1:5.6.1, readline-devel
+BuildRequires: perl >= 1:5.6.1, readline-devel, nspr-devel
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -41,10 +42,11 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -b .make
-%patch1 -b .shlib
+%patch0 -p0 -b .make
+%patch1 -p0 -b .shlib
 %patch2 -p1 -b .vacopy
-%patch3 -b .ldflags
+%patch3 -p0 -b .ldflags
+%patch4 -p1 -b .threadsafe
 %{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
@@ -66,12 +68,14 @@
 %build
 export BUILD_OPT=1
 %{__make} -C src -f Makefile.ref \
+    JS_THREADSAFE="1" \
     XCFLAGS="%{optflags} -fPIC" \
     BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
     JS_READLINE="1" \
 %endif
     JS_PERLCONNECT="1"
+
 cd src/perlconnect
     MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
     %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
@@ -130,6 +134,10 @@
 
 
 %changelog
+* Mon Jul 24 2006 Matthias Saou <http://freshrpms.net/> 1.5-5
+- FC6 rebuild.
+- Enable JS_THREADSAFE in the build (#199696), add patch and nspr build req.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.5-4
 - FC5 rebuild.