From dae02cb5f7687b06690a8310a029078a117b1936 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev (aka Pahan-Hubbitus) <pahan@hubbitus.info>
Date: Apr 06 2011 10:07:43 +0000
Subject: Try build 1.8.5 зку release


---

diff --git a/js-1.7.0-make.patch b/js-1.7.0-make.patch
deleted file mode 100644
index 4622da2..0000000
--- a/js-1.7.0-make.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref	2006-07-26 21:16:47.000000000 +0200
-+++ js/src/Makefile.ref	2007-11-20 22:00:35.000000000 +0100
-@@ -335,8 +335,8 @@ ifdef USE_MSVC
- $(PROGRAM): $(PROG_OBJS) $(LIBRARY)
- 	link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
- else
--$(PROGRAM): $(PROG_OBJS) $(LIBRARY)
--	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) $(LIBRARY) $(LDFLAGS) $(OTHER_LIBS) \
-+$(PROGRAM): $(PROG_OBJS) $(SHARED_LIBRARY)
-+	$(CC) -o $@ $(CFLAGS) $(PROG_OBJS) -L$(OBJDIR) -ljs $(LDFLAGS) $(OTHER_LIBS) \
- 	    $(PROG_LIBS)
- endif
- 
diff --git a/js.spec b/js.spec
index 141c89e..f9478c4 100644
--- a/js.spec
+++ b/js.spec
@@ -1,29 +1,33 @@
-%define real_version 1.7.0
+%global hgdate 51702867d932
 
-Summary:	JavaScript interpreter and libraries
-Name:	js
-Version:	1.70
-Release:	13%{?dist}
+Summary:		JavaScript interpreter and libraries
+Name:		js
+Version:		1.8.5
+Release:		0%{?hgdate:.hg%{hgdate}}%{?dist}
 # The sources are triple licensed, but when we link against readline which is
 # GPL, the result can only be GPL.
 %if 0%{?_without_readline:1}
-License:	GPLv2+ or LGPLv2+ or MPLv1.1
+License:		GPLv2+ or LGPLv2+ or MPLv1.1
 %else
-License:	GPLv2+
+License:		GPLv2+
 %endif
-Group:	Development/Languages
-URL:		http://www.mozilla.org/js/
-Source:	http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
-Patch0:	js-1.7.0-make.patch
-Patch1:	js-shlib.patch
-Patch2:	js-1.5-va_copy.patch
-Patch3:	js-ldflags.patch
-Patch4:	js-1.7.0-threadsafe.patch
-Patch5:	js-1.60-ncurses.patch
-Provides:	libjs = %{version}-%{release}
+Group:		Development/Languages
+URL:			http://www.mozilla.org/js/
+# Source:		http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
+# As we want version 1.8, on regular location only 1.8.0-rc1 placed what is very outdated.
+# we make desision (BZ#676441) build 1.8.5 from FireFox 4.0 source:
+# hg clone http://hg.mozilla.org/mozilla-central/
+# cd mozilla-central
+# tar cjf js-1.8.5-hg51702867d932.tar.bz2 js
+Source0:		%{name}-%{version}%{?hgdate:-hg%{hgdate}}.tar.bz2
+Patch0:		js-1.8.5-make.patch
+Patch1:		js-1.8.5-shlib.patch
+Patch4:		js-1.7.0-threadsafe.patch
+Patch5:		js-1.60-ncurses.patch
+Provides:		libjs = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires:	nspr-devel
-Buildrequires:	readline-devel, ncurses-devel
+Buildrequires:	nspr-devel, python, zip
+Buildrequires:	readline-devel, ncurses-devel, autoconf213
 
 
 %description
@@ -47,14 +51,23 @@ you will need to install %{name}-devel.
 
 
 %prep
+# All patches come from old version and maintainer. I think it is Fedora related only
 %setup -q -n %{name}
 %patch0 -p1 -b .make
-%patch1 -p0 -b .shlib
-%patch2 -p1 -b .vacopy
-%patch3 -p0 -b .ldflags
+%patch1 -p1 -b .shlib
 %patch4 -p1 -b .threadsafe
 %patch5 -p1 -b .ncurses
 
+# Rm parts with spurios licenses, binaries
+# Some parts under BSD (but different suppliers): src/assembler
+#rm -rf src/assembler src/yarr/yarr src/yarr/pcre src/yarr/wtf src/v8-dtoa
+rm -rf src/ctypes/libffi src/t src/tests/src/jstests.jar src/tracevis src/v8
+
+pushd src
+autoconf-2.13
+%configure --with-system-nspr
+popd
+
 # Create pkgconfig file
 %{__cat} > libjs.pc << 'EOF'
 prefix=%{_prefix}
@@ -65,17 +78,17 @@ includedir=%{_includedir}
 Name: libjs
 Description: JS library
 Requires: nspr
-Version: %{real_version}
+Version: %{version}
 Libs: -L${libdir} -ljs
-Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -DJS_C_STRINGS_ARE_UTF8 -I${includedir}
+Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}
 EOF
 
 
 %build
 export BUILD_OPT=1
-%{__make} %{?_smp_mflags} -C src -f Makefile.ref \
+%{__make} %{?_smp_mflags} -C src \
 	JS_THREADSAFE="1" \
-	XCFLAGS="%{optflags} -fPIC -DJS_C_STRINGS_ARE_UTF8" \
+	XCFLAGS="%{optflags} -fPIC " \
 	BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
 	JS_READLINE="1"
@@ -87,14 +100,13 @@ export BUILD_OPT=1
 %{__mkdir_p} %{buildroot}%{_bindir} \
 	%{buildroot}%{_libdir}/pkgconfig \
 	%{buildroot}%{_includedir}
-%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
+%{__install} -m 0755 src/jscpucfg src/shell/js \
 	%{buildroot}%{_bindir}/
-%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
+%{__install} -m 0755 src/libmozjs.so \
 	%{buildroot}%{_libdir}/
-%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
-%{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
+%{__mv} %{buildroot}%{_libdir}/libmozjs.so %{buildroot}%{_libdir}/libmozjs.so.1
+%{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libmozjs.so
 %{__install} -m 0644 src/js*.h src/js.msg src/*.tbl \
-	src/Linux_All_OPT.OBJ/jsautocfg.h \
 	%{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
 	%{buildroot}%{_libdir}/pkgconfig/
@@ -125,6 +137,15 @@ export BUILD_OPT=1
 %{_includedir}/js.msg
 
 %changelog
+* Sat Feb 12 2011 Pavel Alexeev <Pahan@Hubbitus.info> - 1.8.5-0.hg51702867d932
+- Build version 1.8.5 by update request - BZ#676441 from Firefox 4.0 mercurial repository.
+- Gone -DJS_C_STRINGS_ARE_UTF8
+- Add BR autoconf213, change build system to use configure.
+- Adopt patch0 (js-1.7.0-make.patch -> js-1.8.5-make.patch)
+- Adopt patch1 (js-shlib.patch -> js-1.8.5-shlib.patch)
+- Remove Patch2 (js-1.5-va_copy.patch) and Patch3 (js-ldflags.patch)
+- Add BR python, zip.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.70-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild