upgrade to latest Rico+Prototype

dhtml/dhtml.spec

@@ -23,16 +23,17 @@
 ##
 
 #   package version
-%define       V_prototype     1.3.1
-%define       V_scriptaculous 1.5.0
-%define       V_rico          1.1b2
-%define       V_mktree        20051017
-%define       V_dol           20050215
-%define       V_ie7           0_9
-%define       V_tinymce       2_0_1
-%define       V_os3grid       0.6
-%define       V_toolman       0.2
-%define       V_behaviour     1.1
+%define       V_prototype      1.3.1
+%define       V_prototype_snap 1.4.20051216
+%define       V_scriptaculous  1.5.0
+%define       V_rico           1.1.20051216
+%define       V_mktree         20051017
+%define       V_dol            20050215
+%define       V_ie7            0_9
+%define       V_tinymce        2_0_1
+%define       V_os3grid        0.6
+%define       V_toolman        0.2
+%define       V_behaviour      1.1
 
 #   package information
 Name:         dhtml
@@ -44,21 +45,22 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Web
 License:      Open Source
-Version:      20051214
-Release:      20051214
+Version:      20051216
+Release:      20051216
 
 #   list of sources
 Source0:      http://prototype.conio.net/dist/prototype-%{V_prototype}.tar.gz
 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/DynamicOptionList-%{V_dol}.js
-Source5:      http://osdn.dl.sourceforge.net/ie7/IE7_%{V_ie7}.zip
-Source6:      http://osdn.dl.sourceforge.net/tinymce/tinymce_%{V_tinymce}.tgz
-Source7:      http://osdn.dl.sourceforge.net/os3grid/os3grid-%{V_os3grid}.tar.bz2
-Source8:      http://tool-man.org/examples/ToolManDHTML-%{V_toolman}.zip
-Source9:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/behaviour-%{V_behaviour}.js
-Source10:     dhtml.txt
+Source4:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/prototype-%{V_prototype_snap}.js
+Source5:      ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/DynamicOptionList-%{V_dol}.js
+Source6:      http://osdn.dl.sourceforge.net/ie7/IE7_%{V_ie7}.zip
+Source7:      http://osdn.dl.sourceforge.net/tinymce/tinymce_%{V_tinymce}.tgz
+Source8:      http://osdn.dl.sourceforge.net/os3grid/os3grid-%{V_os3grid}.tar.bz2
+Source9:      http://tool-man.org/examples/ToolManDHTML-%{V_toolman}.zip
+Source10:     ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/behaviour-%{V_behaviour}.js
+Source11:     dhtml.txt
 
 #   build information
 Prefix:       %{l_prefix}
@@ -79,6 +81,11 @@ AutoReqProv:  no
         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
+    }
     prog dhtml:scriptaculous = {
         version   = %{V_scriptaculous}
         url       = http://script.aculo.us/downloads
@@ -129,10 +136,10 @@ AutoReqProv:  no
     %setup -q -c
     %setup -q -T -D -a 1
     %setup -q -T -D -a 2
-    %setup -q -T -D -a 6
     %setup -q -T -D -a 7
-    %{l_prefix}/bin/unzip -q -x %{SOURCE5}
-    %{l_prefix}/bin/unzip -q -x %{SOURCE8}
+    %setup -q -T -D -a 8
+    %{l_prefix}/bin/unzip -q -x %{SOURCE6}
+    %{l_prefix}/bin/unzip -q -x %{SOURCE9}
 
 %build
 
@@ -155,6 +162,9 @@ AutoReqProv:  no
     %{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} \
+        $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/rico/prototype.js
     %{l_shtool} install -c -m 644 \
         scriptaculous-js-%{V_scriptaculous}/lib/* \
         scriptaculous-js-%{V_scriptaculous}/src/* \

dhtml/dhtml.txt

@@ -10,8 +10,8 @@ To use these JavaScript libraries...
    - for Prototype:
      <script type="text/javascript" src="/dhtml/prototype/prototype.js"></script>
 
-   - for Rico/Prototype:
-     <script type="text/javascript" src="/dhtml/prototype/prototype.js"></script>
+   - for Rico/Prototype (notice that it uses a different prototype.js!):
+     <script type="text/javascript" src="/dhtml/rico/prototype.js"></script>
      <script type="text/javascript" src="/dhtml/rico/rico.js"></script>
 
    - for Scriptaculous (notice that it uses a different prototype.js!):