diff --git a/dhtml/dhtml.spec b/dhtml/dhtml.spec
index 9cbc4e2606..22037d0535 100644
--- a/dhtml/dhtml.spec
+++ b/dhtml/dhtml.spec
@@ -24,10 +24,10 @@
# package version
%define V_dhtml 20070125
-%define V_prototype 1.4.0
-%define V_prototype_snap 1.4.20051216
+%define V_prototype 1.5.0
+%define V_rico 1.1.2
+%define V_rico_prototype 1.4
%define V_scriptaculous 1.7.0
-%define V_rico 1.1.0
%define V_mktree 20051017
%define V_dol 20050215
%define V_ie7 0_9
@@ -58,7 +58,7 @@
%define V_yui 0.12.2
%define V_cssquery 2.0.2
%define V_ajaxslt 0.4
-%define V_spry P1_2_07-13
+%define V_spry P1_4_12-14
%define V_dojo 0.4.1
%define V_mochikit 1.3.1
%define V_ffjs 1.1
@@ -75,14 +75,14 @@ Class: BASE
Group: HTML
License: Open Source
Version: %{V_dhtml}
-Release: 20070126
+Release: 20070206
# list of sources
-Source0: http://prototype.conio.net/dist/prototype-%{V_prototype}.tar.gz
+Source0: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/prototype-%{V_prototype}.js
Source1: http://script.aculo.us/dist/scriptaculous-js-%{V_scriptaculous}.tar.gz
Source2: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/mktree-%{V_mktree}.tar.gz
Source3: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/rico-%{V_rico}.js
-Source4: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/prototype-%{V_prototype_snap}.js
+Source4: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/rico-%{V_rico}-prototype-%{V_rico_prototype}.js
Source5: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/DynamicOptionList-%{V_dol}.js
Source6: http://switch.dl.sourceforge.net/ie7/IE7_%{V_ie7}.zip
Source7: http://switch.dl.sourceforge.net/tinymce/tinymce_%{V_tinymce}.tgz
@@ -135,19 +135,19 @@ AutoReqProv: no
%track
prog dhtml:prototype = {
version = %{V_prototype}
- url = http://prototype.conio.net/dist/
- regex = prototype-(__VER__)\.tar\.gz
- }
- prog dhtml:prototype-snap = {
- version = %{V_prototype_snap}
- url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
- regex = prototype-(__VER__)\.js
+ url = http://www.prototypejs.org/download
+ regex = version—(__VER__)
}
prog dhtml:scriptaculous = {
version = %{V_scriptaculous}
url = http://script.aculo.us/downloads
regex = scriptaculous-js-(__VER__)\.tar\.gz
}
+ prog dhtml:rico-prototype = {
+ version = %{V_rico_prototype}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = rico-%{V_rico}-prototype-(__VER__)\.js
+ }
prog dhtml:rico = {
version = %{V_rico}
url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
@@ -330,7 +330,7 @@ AutoReqProv: no
}
%prep
- %setup -q -c
+ %setup -q -c -T
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%setup -q -T -D -a 7
@@ -403,13 +403,13 @@ AutoReqProv: no
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/ffjs \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/dwt
%{l_shtool} install -c -m 644 \
- prototype-%{V_prototype}/dist/*.js \
+ %{SOURCE prototype-%{V_prototype}.js} \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/prototype/
%{l_shtool} install -c -m 644 \
%{SOURCE rico-%{V_rico}.js} \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/rico/rico.js
%{l_shtool} install -c -m 644 \
- %{SOURCE prototype-%{V_prototype_snap}.js} \
+ %{SOURCE rico-%{V_rico}-prototype-%{V_rico_prototype}.js} \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/rico/prototype.js
%{l_shtool} install -c -m 644 \
scriptaculous-js-%{V_scriptaculous}/lib/* \
diff --git a/dhtml/dhtml.txt b/dhtml/dhtml.txt
index dd4e1ad445..31a6d61a56 100644
--- a/dhtml/dhtml.txt
+++ b/dhtml/dhtml.txt
@@ -8,7 +8,7 @@ To use these JavaScript libraries...
2. In your HTML code:
- for Prototype:
-
+
- for Rico/Prototype (notice that it uses a different prototype.js!):
@@ -123,3 +123,7 @@ To use these JavaScript libraries...
+ - DWT
+
+
+