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:07:29
Branch: OPENPKG_2_STABLE Handle: 2007022118072801
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/dhtml dhtml.spec dhtml.txt
Log:
MFC: all recent changes
Summary:
Revision Changes Path
1.62.2.7 +174 -26 openpkg-src/dhtml/dhtml.spec
1.11.2.3 +29 -1 openpkg-src/dhtml/dhtml.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhtml/dhtml.spec
============================================================================
$ cvs diff -u -r1.62.2.6 -r1.62.2.7 dhtml.spec
--- openpkg-src/dhtml/dhtml.spec 22 Dec 2006 19:13:20 -0000 1.62.2.6
+++ openpkg-src/dhtml/dhtml.spec 21 Feb 2007 18:07:28 -0000 1.62.2.7
@@ -1,7 +1,7 @@
##
## dhtml.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,15 +23,15 @@
##
# package version
-%define V_dhtml 20060816
-%define V_prototype 1.4.0
-%define V_prototype_snap 1.4.20051216
-%define V_scriptaculous 1.6.5
-%define V_rico 1.1.0
+%define V_dhtml 20070221
+%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_mktree 20051017
%define V_dol 20050215
%define V_ie7 0_9
-%define V_tinymce 2_0_8
+%define V_tinymce 2_1_0
%define V_os3grid 0.6
%define V_toolman 0.2
%define V_behaviour 1.1
@@ -50,19 +50,34 @@
%define V_jsan_jsmodule 0.11
%define V_jsan_httprequest 0.03
%define V_jsan_httppush 0.04
-%define V_jsan_httpcookies 1.01
+%define V_jsan_httpcookies 1.11
%define V_jsan_httpquery 0.03
%define V_jsan_csschange 0.02
%define V_jsan_display 0.06
%define V_jsolait 2006-07-12
-%define V_yui 0.12.1
+%define V_yui 2.2.0
%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
%define V_dwt 0.2
+%define V_jquery 1.1.1
+%define V_jquery_interface 1.2
+%define V_jquery_form 1.0.3
+%define V_jquery_dimensions 20070206
+%define V_jquery_metadata 20070206
+%define V_jquery_highlightfade 0.7
+%define V_jquery_shortkeys 20070207
+%define V_jquery_moreselectors 20060906
+%define V_jquery_F 20061121
+%define V_jquery_cookie 20070207
+%define V_jquery_create 20070207
+%define V_jquery_array 20070207
+%define V_jquery_easing 1.1
+%define V_excanvas 20070207
+%define V_oat 2.1
# package information
Name: dhtml
@@ -75,14 +90,14 @@
Group: HTML
License: Open Source
Version: %{V_dhtml}
-Release: 2.20061222
+Release: 2.20070221
# 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
@@ -117,7 +132,22 @@
Source36: http://mochikit.com/dist/MochiKit-%{V_mochikit}.zip
Source37: http://fforw.de/static/files/ffjs-r%{V_ffjs}.zip
Source38: http://switch.dl.sourceforge.net/dwt/dwt-%{V_dwt}.tar.gz
-Source39: dhtml.txt
+Source39:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-%{V_jquery}.pack.js
+Source40:
http://interface.eyecon.ro/interface/interface_%{V_jquery_interface}.zip
+Source41:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-form-%{V_jquery_form}.js
+Source42:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-dimensions-%{V_jquery_dimensions}.js
+Source43:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-metadata-%{V_jquery_metadata}.js
+Source44:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-highlightfade-%{V_jquery_highlightfade}.js
+Source45:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-shortkeys-%{V_jquery_shortkeys}.js
+Source46:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-moreselectors-%{V_jquery_moreselectors}.js
+Source47:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-F-%{V_jquery_F}.js
+Source48:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-cookie-%{V_jquery_cookie}.js
+Source49:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-create-%{V_jquery_create}.js
+Source50:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-array-%{V_jquery_array}.js
+Source51:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/jquery-easing-%{V_jquery_easing}.js
+Source52:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/excanvas-%{V_excanvas}.js
+Source53: http://switch.dl.sourceforge.net/oat/oat-%{V_oat}.tar.gz
+Source54: dhtml.txt
# build information
Prefix: %{l_prefix}
@@ -135,19 +165,19 @@
%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/
@@ -328,9 +358,79 @@
url = http://prdownloads.sourceforge.net/dwt/
regex = dwt-(__VER__)\.tar\.gz
}
+ prog dhtml:jquery = {
+ version = %{V_jquery}
+ url = http://jquery.com/dev/svn/tags/
+ regex = tags/(\d+\.\d+\.\d+)
+ }
+ prog dhtml:jquery-interface = {
+ version = %{V_jquery_interface}
+ url = http://interface.eyecon.ro/download
+ regex = interface_(__VER__)\.zip
+ }
+ prog dhtml:jquery-form = {
+ version = %{V_jquery_form}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-form-(__VER__)\.js
+ }
+ prog dhtml:jquery-dimensions = {
+ version = %{V_jquery_dimensions}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-dimensions-(__VER__)\.js
+ }
+ prog dhtml:jquery-metadata = {
+ version = %{V_jquery_metadata}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-metadata-(__VER__)\.js
+ }
+ prog dhtml:jquery-highlightfade = {
+ version = %{V_jquery_highlightfade}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-highlightfade-(__VER__)\.js
+ }
+ prog dhtml:jquery-shortkeys = {
+ version = %{V_jquery_shortkeys}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-shortkeys-(__VER__)\.js
+ }
+ prog dhtml:jquery-moreselectors = {
+ version = %{V_jquery_moreselectors}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-moreselectors-(__VER__)\.js
+ }
+ prog dhtml:jquery-F = {
+ version = %{V_jquery_F}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-F-(__VER__)\.js
+ }
+ prog dhtml:jquery-cookie = {
+ version = %{V_jquery_cookie}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-cookie-(__VER__)\.js
+ }
+ prog dhtml:jquery-create = {
+ version = %{V_jquery_create}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-create-(__VER__)\.js
+ }
+ prog dhtml:jquery-array = {
+ version = %{V_jquery_array}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = jquery-array-(__VER__)\.js
+ }
+ prog dhtml:excanvas = {
+ version = %{V_excanvas}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/dhtml/
+ regex = excanvas-(__VER__)\.js
+ }
+ prog dhtml:oat = {
+ version = %{V_oat}
+ url = http://prdownloads.sourceforge.net/oat/
+ regex = oat-(__VER__)\.tar\.gz
+ }
%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
@@ -365,6 +465,8 @@
%{l_prefix}/bin/unzip -q -x %{SOURCE36}
%{l_prefix}/bin/unzip -q -x %{SOURCE37}
%setup -q -T -D -a 38
+ %{l_prefix}/bin/unzip -q -x %{SOURCE40}
+ %setup -q -T -D -a 53
%build
@@ -398,15 +500,18 @@
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/dojo \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/mochikit \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/ffjs \
- $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/dwt
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/dwt \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/excanvas \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/oat
%{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/* \
@@ -517,6 +622,49 @@
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/ffjs/
cp -rp dwt-%{V_dwt}/WebContent/* \
$RPM_BUILD_ROOT%{l_prefix}/share/dhtml/dwt/
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-%{V_jquery}.pack.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/jquery.js
+ cp "interface %{V_jquery_interface}/interface.js" \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-form-%{V_jquery_form}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/form.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-dimensions-%{V_jquery_dimensions}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/dimensions.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-metadata-%{V_jquery_metadata}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/metadata.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-highlightfade-%{V_jquery_highlightfade}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/highlightfade.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-shortkeys-%{V_jquery_shortkeys}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/shortkeys.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-moreselectors-%{V_jquery_moreselectors}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/moreselectors.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-F-%{V_jquery_F}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/F.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-cookie-%{V_jquery_cookie}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/cookie.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-create-%{V_jquery_create}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/create.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-array-%{V_jquery_array}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/array.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE jquery-easing-%{V_jquery_easing}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/plugin/easing.js
+ %{l_shtool} install -c -m 644 \
+ %{SOURCE excanvas-%{V_excanvas}.js} \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/excanvas/excanvas.js
+ cp -rp oat-%{V_oat}/oat/*.js \
+ $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/oat/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhtml/dhtml.txt
============================================================================
$ cvs diff -u -r1.11.2.2 -r1.11.2.3 dhtml.txt
--- openpkg-src/dhtml/dhtml.txt 16 Oct 2006 14:49:28 -0000 1.11.2.2
+++ openpkg-src/dhtml/dhtml.txt 21 Feb 2007 18:07:29 -0000 1.11.2.3
@@ -8,7 +8,7 @@
2. In your HTML code:
- for Prototype:
- <!-- Prototype (http://prototype.conio.net/) -->
+ <!-- Prototype (http://www.prototypejs.org/) -->
<script type="text/javascript"
src="/dhtml/prototype/prototype.js"></script>
- for Rico/Prototype (notice that it uses a different prototype.js!):
@@ -123,3 +123,31 @@
<!-- FF JavaScript Library
(http://fforw.de/post/ff_javascript_library/) -->
<script type="text/javascript" src="/dhtml/ffjs/ff.js"></script>
+ - DWT
+ <!-- Inline DHTML Window Toolkit (http://sourceforge.net/projects/dwt/)
-->
+ <script type="text/javascript" src="/dhtml/dwt/dwt.js"></script>
+
+ - jQuery
+ <!-- JavaScript Toolkit (http://www.jquery.com/) -->
+ <script type="text/javascript" src="/dhtml/jquery/jquery.js"></script>
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/form.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/interface.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/dimensions.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/metadata.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/highlightfade.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/shortkeys.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/moreselectors.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/F.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/create.js"></script>]
+ [<script type="text/javascript"
src="/dhtml/jquery/plugin/easing.js"></script>]
+ [<script type="text/javascript">jQuery.noConflict(); var j$ =
jQuery;</script>]
+
+ - ExplorerCanvas
+ <!-- Google <CANVAS> Emulation for Internet Explorer
(http://excanvas.sourceforge.net/) -->
+ <script type="text/javascript"
src="/dhtml/excanvas/excanvas.js"></script>
+
+ - OAT
+ <!-- OAT JavaScript Toolkit (http://oat.openlinksw.com/) -->
+ <script type="text/javascript">var featureList =
["grid","pivot",barchart"];<script>
+ <script type="text/javascript" src="/dhtml/oat/loader.js"><script>
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
