OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Feb-2007 19:19:16
Branch: OPENPKG_2_STABLE Handle: 2007022118191500
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/js js.patch js.spec
Log:
MFC: recent changes
Summary:
Revision Changes Path
1.11.2.3 +3 -3 openpkg-src/js/js.patch
1.30.2.3 +20 -6 openpkg-src/js/js.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.patch
============================================================================
$ cvs diff -u -r1.11.2.2 -r1.11.2.3 js.patch
--- openpkg-src/js/js.patch 16 Oct 2006 14:51:28 -0000 1.11.2.2
+++ openpkg-src/js/js.patch 21 Feb 2007 18:19:15 -0000 1.11.2.3
@@ -44,9 +44,9 @@
}
1;
-Index: JavaScript-1.00_02/Makefile.PL
---- JavaScript-1.00_02/Makefile.PL.orig 2006-08-13 17:37:46 +0200
-+++ JavaScript-1.00_02/Makefile.PL 2006-08-20 17:57:22 +0200
+Index: JavaScript-1.02/Makefile.PL
+--- JavaScript-1.02/Makefile.PL.orig 2006-08-13 17:37:46 +0200
++++ JavaScript-1.02/Makefile.PL 2006-08-20 17:57:22 +0200
@@ -22,7 +22,7 @@
push @defines, "JS_THREADSAFE";
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/js/js.spec
============================================================================
$ cvs diff -u -r1.30.2.2 -r1.30.2.3 js.spec
--- openpkg-src/js/js.spec 16 Oct 2006 14:51:28 -0000 1.30.2.2
+++ openpkg-src/js/js.spec 21 Feb 2007 18:19:15 -0000 1.30.2.3
@@ -1,7 +1,7 @@
##
## js.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -23,12 +23,13 @@
##
# package version
-%define V_js 1.6.20060820
-%define V_javascript 1.00_02
+%define V_js 1.6.20070208
+%define V_javascript 1.02
%define V_javascript_spidermonkey 0.17
%define V_javascript_squish 0.05
-%define V_javascript_code 0.05
+%define V_javascript_code 0.08
%define V_javascript_jslint 0.04
+%define V_jsmin 20070108
# package information
Name: js
@@ -41,7 +42,7 @@
Group: Language
License: MPL/GPL/LGPL
Version: %{V_js}
-Release: 2.20061018
+Release: 2.20070221
# package options
%option with_file yes
@@ -57,6 +58,7 @@
Source3:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Squish-%{V_javascript_squish}.tar.gz
Source4:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Code-%{V_javascript_code}.tar.gz
Source5:
http://www.cpan.org/modules/by-module/JavaScript/JavaScript-JSLint-%{V_javascript_jslint}.tar.gz
+Source6:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/jsmin/jsmin-%{V_jsmin}.c
Patch0: js.patch
# build information
@@ -115,6 +117,11 @@
url = http://www.cpan.org/modules/by-module/JavaScript/
regex = JavaScript-JSLint-(__VER__)\.tar\.gz
}
+ prog js:jsmin = {
+ version = %{V_jsmin}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/jsmin/
+ regex = jsmin-(__VER__)\.c
+ }
%prep
%setup -q -c
@@ -156,6 +163,9 @@
%{l_make} %{l_mflags}
) || exit $?
+ # build add-on tool
+ %{l_cc} -o jsmin %{SOURCE jsmin-%{V_jsmin}.c}
+
%if "%{with_perl}" == "yes"
# build add-on Perl bindings
( cd JavaScript-%{V_javascript}
@@ -198,6 +208,10 @@
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
+ # install add-on tool
+ %{l_shtool} install -c -s -m 755 \
+ jsmin $RPM_BUILD_ROOT%{l_prefix}/bin/
+
%if "%{with_perl}" == "yes"
# install add-on Perl bindings
( cd JavaScript-%{V_javascript}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
