upgrading package: js 1.5rc6a -> 1.5

js/js.patch

@@ -1,15 +1,3 @@
-Index: perlconnect/JS.xs
---- perlconnect/JS.xs.orig	2002-03-19 05:28:56 +0100
-+++ perlconnect/JS.xs	2004-06-27 13:53:22 +0200
-@@ -56,7 +56,7 @@
- 
- #include <jsapi.h>
- #include "jsperlpvt.h"
--#include <malloc.h>
-+#include <stdlib.h>
- 
- /* __REMOVE__ */
- /* #include <stdio.h>  */
 Index: rules.mk
 --- rules.mk.orig	2003-11-15 01:11:04 +0100
 +++ rules.mk	2004-06-27 13:54:04 +0200

js/js.spec

@@ -22,10 +22,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   package version
-%define       V_major 1.5
-%define       V_minor rc6a
-
 #   package information
 Name:         js
 Summary:      Mozilla JavaScript (JS)
@@ -36,14 +32,14 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Language
 License:      MPL/GPL/LGPL
-Version:      %{V_major}%{V_minor}
-Release:      20040627
+Version:      1.5
+Release:      20051025
 
 #   package options
 %option       with_perl  no
 
 #   list of sources
-Source0:      http://ftp.mozilla.org/pub/mozilla.org/js/js-%{V_major}-%{V_minor}.tar.gz
+Source0:      http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
 Source1:      js.pc
 Patch0:       js.patch
 
@@ -69,7 +65,7 @@ AutoReqProv:  no
 
 %track
     prog js = {
-        version   = %{V_major}-%{V_minor}
+        version   = %{version}
         url       = http://ftp.mozilla.org/pub/mozilla.org/js/
         regex     = js-(__VER__)\.tar\.gz
     }
@@ -79,31 +75,32 @@ AutoReqProv:  no
     %patch -p0 -d js/src
 
 %build
-    ( cd js/src
-      #   prepare build environment
-      cp Makefile.ref Makefile
-      case "%{l_platform -t}" in
-          *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;;
-      esac
-
-      #   build components
-      %{l_make} %{l_mflags} \
-          CC="%{l_cc}" \
-          XCFLAGS="%{l_cppflags} %{l_cflags -O}" \
-          XLDFLAGS="%{l_ldflags}" \
-          BUILD_OPT=1 \
-          JS_EDITLINE=1
+    cd js/src
+
+    #   build components
+    cp Makefile.ref Makefile
+    case "%{l_platform -t}" in
+        *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;;
+    esac
+    touch config/`uname -s``uname -r`.mk
+    %{l_make} %{l_mflags} \
+        CC="%{l_cc}" \
+        XCFLAGS="%{l_cppflags} %{l_cflags -O}" \
+        XLDFLAGS="%{l_ldflags}" \
+        BUILD_OPT=1 \
+        JS_EDITLINE=1
+
 %if "%{with_perl}" == "yes"
-      objdir="`echo *.OBJ`"
-      %{l_shtool} subst \
-          -e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \
-          -e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \
-          perlconnect/Makefile.PL
-      %{l_prefix}/bin/perl-openpkg prepare
-      %{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure
-      %{l_prefix}/bin/perl-openpkg -d perlconnect build
+    #   build Perl API
+    objdir="`echo *.OBJ`"
+    %{l_shtool} subst \
+        -e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \
+        -e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \
+        perlconnect/Makefile.PL
+    %{l_prefix}/bin/perl-openpkg prepare
+    %{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure
+    %{l_prefix}/bin/perl-openpkg -d perlconnect build
 %endif
-    ) || exit $?
 
 %install
     #   create installation hierarchy