From 6ebc0db277be711eb274aa1039616c02d472257a Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Apr 10 2007 11:06:04 +0000
Subject: Backport devel 1.60 update + fixes.


---

diff --git a/.cvsignore b/.cvsignore
index e63c3db..b6e62e9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-js-1.5.tar.gz
+js-1.60.tar.gz
diff --git a/js-1.60-ncurses.patch b/js-1.60-ncurses.patch
new file mode 100644
index 0000000..6002715
--- /dev/null
+++ b/js-1.60-ncurses.patch
@@ -0,0 +1,12 @@
+diff -Naupr js.orig/src/Makefile.ref js/src/Makefile.ref
+--- js.orig/src/Makefile.ref	2006-08-21 20:58:45.000000000 +0200
++++ js/src/Makefile.ref	2007-02-02 12:59:06.000000000 +0100
+@@ -132,7 +132,7 @@ endif 
+ ifdef JS_READLINE
+ # For those platforms with the readline library installed.
+ DEFINES += -DEDITLINE
+-PROG_LIBS += -lreadline -ltermcap
++PROG_LIBS += -lreadline -lncurses
+ else
+ ifdef JS_EDITLINE
+ # Use the editline library, built locally.
diff --git a/js.spec b/js.spec
index d8a6267..a6c5992 100644
--- a/js.spec
+++ b/js.spec
@@ -2,8 +2,8 @@
 
 Summary: JavaScript interpreter and libraries
 Name: js
-Version: 1.5
-Release: 6%{?dist}
+Version: 1.60
+Release: 2%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -17,9 +17,12 @@ Patch1: js-shlib.patch
 Patch2: js-1.5-va_copy.patch
 Patch3: js-ldflags.patch
 Patch4: js-1.5-threadsafe.patch
+Patch5: js-1.60-ncurses.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, nspr-devel
+BuildRequires: perl >= 1:5.6.1, readline-devel, ncurses-devel, nspr-devel
+# Temporary fix (#226970 - nspr-devel should require pkgconfig)
+Buildrequires: pkgconfig
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -47,6 +50,7 @@ you will need to install %{name}-devel.
 %patch2 -p1 -b .vacopy
 %patch3 -p0 -b .ldflags
 %patch4 -p1 -b .threadsafe
+%patch5 -p1 -b .ncurses
 %{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
@@ -89,17 +93,23 @@ cd -
              %{buildroot}%{_includedir}
 %{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
     %{buildroot}%{_bindir}/
-%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \
+%{__install} -m 0644 src/Linux_All_OPT.OBJ/libjs.a \
+    %{buildroot}%{_libdir}/
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.so \
     %{buildroot}%{_libdir}/
 %{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
-%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
-  %{buildroot}%{_includedir}/
+%{__install} -m 0644 src/js*.h src/js.msg src/jsopcode.tbl \
+    src/Linux_All_OPT.OBJ/jsautocfg.h \
+    %{buildroot}%{_includedir}/
 %{__install} -m 0644 libjs.pc \
     %{buildroot}%{_libdir}/pkgconfig/
 %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
+# Remove unwanted perl related files
 find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm
 find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm
+# For some reason, the pure_install above doesn't set u+w :-(
+find %{buildroot}%{perl_vendorarch} -type f -exec %{__chmod} u+w {} \;
 
 
 %clean
@@ -117,7 +127,7 @@ LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc src/README*.html src/perlconnect/bg.jpg
 %{_bindir}/js
 %{_libdir}/*.so.*
@@ -125,15 +135,27 @@ LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
 %{perl_vendorarch}/*.pm
 
 %files devel
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %{_bindir}/jscpucfg
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_includedir}/js*.h
+%{_includedir}/jsopcode.tbl
+%{_includedir}/js.msg
 
 
 %changelog
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.60-2
+- Include jsopcode.tbl and js.msg in devel (#235481).
+- Install static lib mode 644 instead of 755.
+
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.60-1
+- Update to 1.60.
+- Rebuild in order to link against ncurses instead of termcap (#226773).
+- Add ncurses-devel build requirement and patch s/termcap/ncurses/ in.
+- Change mode of perl library from 555 to 755 (#224603).
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.5-6
 - Fix pkgconfig file (#204232 & dupe #204236).
 
@@ -165,7 +187,7 @@ LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
 - rebuilt
 
 * Mon Feb 14 2005 David Woodhouse <dwmw2@infradead.org> - 1.5-0.rc6a.4
-- Take js-va_copy.patch out of %ifarch x86_64 so it fixes the PPC build too
+- Take js-va_copy.patch out of %%ifarch x86_64 so it fixes the PPC build too
 
 * Sun Feb 13 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 1.5-0.rc6a.3
 - Add js-va_copy.patch to fix x86_64; Patch was found in a Mandrake srpm
diff --git a/sources b/sources
index c6dbd67..5450ce8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-863bb6462f4ce535399a7c6276ae6776  js-1.5.tar.gz
+bd8f021e43a8fbbec55ac2cd3d483243  js-1.60.tar.gz