cleanup

dhtml/dhtml.spec

@@ -60,7 +60,6 @@
 %define       V_dojo                     1.4.1
 %define       V_mochikit                 1.4.2
 %define       V_ffjs                     1.11
-%define       V_dwt                      0.2
 %define       V_jquery                   1.4.1
 %define       V_jquery_interface         1.2
 %define       V_excanvas                 20090130
@@ -80,7 +79,7 @@ Class:        BASE
 Group:        HTML
 License:      Open Source
 Version:      0
-Release:      20100126
+Release:      20100206
 
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/dhtml/prototype-%{V_prototype}.js
@@ -121,15 +120,14 @@ Source34:     http://download.openpkg.org/components/versioned/dhtml/spry_%{V_sp
 Source35:     http://download.dojotoolkit.org/release-%{V_dojo}/dojo-release-%{V_dojo}.tar.gz
 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:     http://code.jquery.com/jquery-%{V_jquery}.min.js
-Source40:     http://interface.eyecon.ro/interface/interface_%{V_jquery_interface}.zip
-Source41:     http://download.openpkg.org/components/versioned/dhtml/excanvas-%{V_excanvas}.js
-Source42:     http://switch.dl.sourceforge.net/oat/oat-%{V_oat}.tar.gz
-Source43:     http://extjs.com/deploy/ext-%{V_extjs}.zip
-Source44:     http://download.openpkg.org/components/versioned/dhtml/raphael-%{V_raphael}.js
-Source45:     http://svgweb.googlecode.com/files/svgweb-%{V_svgweb}.zip
-Source46:     dhtml.txt
+Source38:     http://code.jquery.com/jquery-%{V_jquery}.min.js
+Source39:     http://interface.eyecon.ro/interface/interface_%{V_jquery_interface}.zip
+Source40:     http://download.openpkg.org/components/versioned/dhtml/excanvas-%{V_excanvas}.js
+Source41:     http://switch.dl.sourceforge.net/oat/oat-%{V_oat}.tar.gz
+Source42:     http://extjs.com/deploy/ext-%{V_extjs}.zip
+Source43:     http://download.openpkg.org/components/versioned/dhtml/raphael-%{V_raphael}.js
+Source44:     http://svgweb.googlecode.com/files/svgweb-%{V_svgweb}.zip
+Source45:     dhtml.txt
 
 #   build information
 Prefix:       %{l_prefix}
@@ -183,7 +181,7 @@ AutoReqProv:  no
     prog dhtml:tinymce = {
         version   = %{V_tinymce}
         url       = http://sourceforge.net/projects/tinymce/files/
-        regex     = tinymce_(__VER__)\.zip
+        regex     = tinymce_(\d+_\d+_\d+)\.zip
     }
     prog dhtml:os3grid = {
         version   = %{V_os3grid}
@@ -332,14 +330,9 @@ AutoReqProv:  no
     }
     prog dhtml:ffjs = {
         version   = %{V_ffjs}
-        url       = http://fforw.de/post/ff_javascript_library/
+        url       = http://fforw.de/ffjs/
         regex     = ffjs-r(__VER__)\.zip
     }
-    prog dhtml:dwt = {
-        version   = %{V_dwt}
-        url       = http://sourceforge.net/projects/dwt/files/
-        regex     = dwt-(__VER__)\.tar\.gz
-    }
     prog dhtml:jquery = {
         version   = %{V_jquery}
         url       = http://jquery.com/
@@ -363,7 +356,7 @@ AutoReqProv:  no
     prog dhtml:extjs = {
         version   = %{V_extjs}
         url       = http://www.extjs.com/products/extjs/download.php
-        regex     = ext-(__VER__)\.zip
+        regex     = Ext\s+JS\s+(\d+\.\d+\.\d+)
     }
     prog dhtml:raphael = {
         version   = %{V_raphael}
@@ -412,13 +405,12 @@ AutoReqProv:  no
     %setup -q -T -D -a 35
     %{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 42
+    %{l_prefix}/bin/unzip -q -x %{SOURCE39}
+    %setup -q -T -D -a 41
     mkdir ext-%{V_extjs}
-    %{l_prefix}/bin/unzip -q -x %{SOURCE43}
+    %{l_prefix}/bin/unzip -q -x %{SOURCE42}
     chmod -R a+r MochiKit-%{V_mochikit}
-    %{l_prefix}/bin/unzip -q -x %{SOURCE45}
+    %{l_prefix}/bin/unzip -q -x %{SOURCE44}
 
 %build
 
@@ -453,7 +445,6 @@ AutoReqProv:  no
         $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/jquery \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/excanvas \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/oat \
@@ -584,8 +575,6 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 644 \
         script/ff.js \
         $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}.min.js} \
         $RPM_BUILD_ROOT%{l_prefix}/share/dhtml/jquery/jquery.js

dhtml/dhtml.txt

@@ -123,10 +123,6 @@ To use these JavaScript libraries...
      <!-- 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>