- updated to rc5a, added more fixes to makefile patch

Changed files:
    js-makefile.patch -> 1.2
    js.spec -> 1.13

diff --git a/js-makefile.patch b/js-makefile.patch
index 1f30894813f1f03f7d5737cf39a414f372a07c6e..e827ec527a92028e11cd9246ef9bb1d53a0e8554 100644 (file)
--- a/js-makefile.patch
+++ b/js-makefile.patch
@@ -9,6 +9,23 @@
  ifdef USE_MSVC
  OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr${NSPR_LIBSUFFIX}.lib
  else
+@@ -122,7 +122,7 @@
+ ifdef JS_READLINE
+ # For those platforms with the readline library installed.
+ DEFINES += -DEDITLINE
+-PROG_LIBS += -lreadline -ltermcap
++PROG_LIBS += -lreadline
+ else
+ ifdef JS_EDITLINE
+ # Use the editline library, built locally.
+@@ -281,6 +281,7 @@
+ PROGRAM = $(OBJDIR)/js
+ ifdef JS_PERLCONNECT
+ PROG_LIBS += $(PERLLDFLAGS)
++OTHER_LIBS += $(PERLLDFLAGS)
+ endif
+ endif
+ 
 @@ -291,7 +291,7 @@
        link.exe -out:"$@" $(EXE_LINK_FLAGS) $^
  else

diff --git a/js.spec b/js.spec
index d8938e609064af733f3fc06a9b3fab850e42c9f9..a057a030ced1870afb1af349385b7ed15d9ea0e8 100644 (file)
--- a/js.spec
+++ b/js.spec
@@ -8,7 +8,7 @@ Summary:        JavaScript Reference Implementation
 Summary(pl):   Wzorcowa implementacja JavaScriptu
 Name:          js
 Version:       1.5
-%define        rcver   rc5
+%define        rcver   rc5a
 Release:       0.%{rcver}.1
 License:       GPL or Netscape Public License 1.1
 Group:         Libraries
@@ -136,8 +136,6 @@ Modu
 %patch -p1
 
 %build
-#make -C src -f Makefile.ref BUILD_OPT=1 XMKSHLIBOPTS="-soname libjs.so.0"
-
 %{__make} -C src -f Makefile.ref \
        %{!?debug:BUILD_OPT=1} \
        OPTIMIZER="%{rpmcflags}" \