upgrade to release version of Drupal 4.6 and add a bunch of new also ported modules

drupal/drupal.spec

@@ -24,19 +24,36 @@
 
 #   package versions
 %define       V_drupal_major               4.6
-%define       V_drupal                     cvs
+%define       V_drupal                     4.6.0
 %define       V_module_article             4.6.0
+%define       V_module_attachment          4.6.0
 %define       V_module_buddylist           4.6.0
 %define       V_module_commentcloser       4.6.0
 %define       V_module_customerror         4.6.0
 %define       V_module_contextlinks        4.6.0
 %define       V_module_daily               4.6.0
+%define       V_module_diff                4.6.0
 %define       V_module_feedback            4.6.0
+%define       V_module_filemanager         4.6.0
 %define       V_module_flexinode           4.6.0
 %define       V_module_fontsize            4.6.0
+%define       V_module_forms               4.6.0
+%define       V_module_form_mail           4.6.0
+%define       V_module_freelinking         4.6.0
 %define       V_module_front               4.6.0
+%define       V_module_glossary            4.6.0
+%define       V_module_hof                 4.6.0
+%define       V_module_htmlarea            4.6.0
+%define       V_module_image               4.6.0
 %define       V_module_livediscussions     4.6.0
+%define       V_module_mailalias           4.6.0
+%define       V_module_mailhandler         4.6.0
+%define       V_module_members             4.6.0
+%define       V_module_menu_otf            4.6.0
 %define       V_module_nodewords           4.6.0
+%define       V_module_nmoderation         4.6.0
+%define       V_module_node_import         4.6.0
+%define       V_module_og                  4.6.0
 %define       V_module_paypal_framework    4.6.0
 %define       V_module_paypal_subscription 4.6.0
 %define       V_module_quotes              4.6.0
@@ -44,10 +61,24 @@
 %define       V_module_series              4.6.0
 %define       V_module_sitemenu            4.6.0
 %define       V_module_smartypants         4.6.0
+%define       V_module_survey              4.6.0
+%define       V_module_syndication         4.6.0
 %define       V_module_taxonomy_block      4.6.0
+%define       V_module_taxonomy_browser    4.6.0
+%define       V_module_taxonomy_dhtml      4.6.0
 %define       V_module_taxonomy_menu       4.6.0
+%define       V_module_taxonomy_multi_edit 4.6.0
 %define       V_module_textile             4.6.0
+%define       V_module_theme_editor        4.6.0
+%define       V_module_tinymce             4.6.0
+%define       V_module_urlfilter           4.6.0
+%define       V_module_variable            4.6.0
+%define       V_module_webform             4.6.0
+%define       V_module_webserver_auth      4.6.0
 %define       V_module_week                4.6.0
+%define       V_engine_phptemplate         4.6.0
+%define       V_theme_spreadfirefox        4.6.0
+%define       V_theme_democratica          4.6.0
 
 #   package information
 Name:         drupal
@@ -60,33 +91,64 @@ Class:        EVAL
 Group:        Web
 License:      GPL
 Version:      %{V_drupal_major}
-Release:      20050410
+Release:      20050416
 
 #   list of sources
 Source0:      http://drupal.org/files/projects/drupal-%{V_drupal}.tar.gz
 Source1:      http://drupal.org/files/projects/article-%{V_module_article}.tar.gz
-Source2:      http://drupal.org/files/projects/buddylist-%{V_module_buddylist}.tar.gz
-Source3:      http://drupal.org/files/projects/commentcloser-%{V_module_commentcloser}.tar.gz
-Source4:      http://drupal.org/files/projects/customerror-%{V_module_customerror}.tar.gz
-Source5:      http://drupal.org/files/projects/contextlinks-%{V_module_contextlinks}.tar.gz
-Source6:      http://drupal.org/files/projects/daily-%{V_module_daily}.tar.gz
-Source7:      http://drupal.org/files/projects/feedback-%{V_module_feedback}.tar.gz
-Source8:      http://drupal.org/files/projects/flexinode-%{V_module_flexinode}.tar.gz
-Source9:      http://drupal.org/files/projects/fontsize-%{V_module_fontsize}.tar.gz
-Source10:     http://drupal.org/files/projects/front-%{V_module_front}.tar.gz
-Source11:     http://drupal.org/files/projects/livediscussions-%{V_module_livediscussions}.tar.gz
-Source12:     http://drupal.org/files/projects/nodewords-%{V_module_nodewords}.tar.gz
-Source13:     http://drupal.org/files/projects/paypal_framework-%{V_module_paypal_framework}.tar.gz
-Source14:     http://drupal.org/files/projects/paypal_subscription-%{V_module_paypal_subscription}.tar.gz
-Source15:     http://drupal.org/files/projects/quotes-%{V_module_quotes}.tar.gz
-Source16:     http://drupal.org/files/projects/rsvp-%{V_module_rsvp}.tar.gz
-Source17:     http://drupal.org/files/projects/series-%{V_module_series}.tar.gz
-Source18:     http://drupal.org/files/projects/sitemenu-%{V_module_sitemenu}.tar.gz
-Source19:     http://drupal.org/files/projects/smartypants-%{V_module_smartypants}.tar.gz
-Source20:     http://drupal.org/files/projects/taxonomy_block-%{V_module_taxonomy_block}.tar.gz
-Source21:     http://drupal.org/files/projects/taxonomy_menu-%{V_module_taxonomy_menu}.tar.gz
-Source22:     http://drupal.org/files/projects/textile-%{V_module_textile}.tar.gz
-Source23:     http://drupal.org/files/projects/week-%{V_module_week}.tar.gz
+Source2:      http://drupal.org/files/projects/attachment-%{V_module_attachment}.tar.gz
+Source3:      http://drupal.org/files/projects/buddylist-%{V_module_buddylist}.tar.gz
+Source4:      http://drupal.org/files/projects/commentcloser-%{V_module_commentcloser}.tar.gz
+Source5:      http://drupal.org/files/projects/customerror-%{V_module_customerror}.tar.gz
+Source6:      http://drupal.org/files/projects/contextlinks-%{V_module_contextlinks}.tar.gz
+Source7:      http://drupal.org/files/projects/daily-%{V_module_daily}.tar.gz
+Source8:      http://drupal.org/files/projects/diff-%{V_module_diff}.tar.gz
+Source9:      http://drupal.org/files/projects/feedback-%{V_module_feedback}.tar.gz
+Source10:     http://drupal.org/files/projects/filemanager-%{V_module_filemanager}.tar.gz
+Source11:     http://drupal.org/files/projects/flexinode-%{V_module_flexinode}.tar.gz
+Source12:     http://drupal.org/files/projects/fontsize-%{V_module_fontsize}.tar.gz
+Source13:     http://drupal.org/files/projects/forms-%{V_module_forms}.tar.gz
+Source14:     http://drupal.org/files/projects/form_mail-%{V_module_form_mail}.tar.gz
+Source15:     http://drupal.org/files/projects/freelinking-%{V_module_freelinking}.tar.gz
+Source16:     http://drupal.org/files/projects/front-%{V_module_front}.tar.gz
+Source17:     http://drupal.org/files/projects/glossary-%{V_module_glossary}.tar.gz
+Source18:     http://drupal.org/files/projects/hof-%{V_module_hof}.tar.gz
+Source19:     http://drupal.org/files/projects/htmlarea-%{V_module_htmlarea}.tar.gz
+Source20:     http://drupal.org/files/projects/image-%{V_module_image}.tar.gz
+Source21:     http://drupal.org/files/projects/livediscussions-%{V_module_livediscussions}.tar.gz
+Source22:     http://drupal.org/files/projects/mailalias-%{V_module_mailalias}.tar.gz
+Source23:     http://drupal.org/files/projects/mailhandler-%{V_module_mailhandler}.tar.gz
+Source24:     http://drupal.org/files/projects/members-%{V_module_members}.tar.gz
+Source25:     http://drupal.org/files/projects/menu_otf-%{V_module_menu_otf}.tar.gz
+Source26:     http://drupal.org/files/projects/nodewords-%{V_module_nodewords}.tar.gz
+Source27:     http://drupal.org/files/projects/nmoderation-%{V_module_nmoderation}.tar.gz
+Source28:     http://drupal.org/files/projects/node_import-%{V_module_node_import}.tar.gz
+Source29:     http://drupal.org/files/projects/og-%{V_module_og}.tar.gz
+Source30:     http://drupal.org/files/projects/paypal_framework-%{V_module_paypal_framework}.tar.gz
+Source31:     http://drupal.org/files/projects/paypal_subscription-%{V_module_paypal_subscription}.tar.gz
+Source32:     http://drupal.org/files/projects/quotes-%{V_module_quotes}.tar.gz
+Source33:     http://drupal.org/files/projects/rsvp-%{V_module_rsvp}.tar.gz
+Source34:     http://drupal.org/files/projects/series-%{V_module_series}.tar.gz
+Source35:     http://drupal.org/files/projects/sitemenu-%{V_module_sitemenu}.tar.gz
+Source36:     http://drupal.org/files/projects/smartypants-%{V_module_smartypants}.tar.gz
+Source37:     http://drupal.org/files/projects/survey-%{V_module_survey}.tar.gz
+Source38:     http://drupal.org/files/projects/syndication-%{V_module_syndication}.tar.gz
+Source39:     http://drupal.org/files/projects/taxonomy_block-%{V_module_taxonomy_block}.tar.gz
+Source40:     http://drupal.org/files/projects/taxonomy_browser-%{V_module_taxonomy_browser}.tar.gz
+Source41:     http://drupal.org/files/projects/taxonomy_dhtml-%{V_module_taxonomy_dhtml}.tar.gz
+Source42:     http://drupal.org/files/projects/taxonomy_menu-%{V_module_taxonomy_menu}.tar.gz
+Source43:     http://drupal.org/files/projects/taxonomy_multi_edit-%{V_module_taxonomy_multi_edit}.tar.gz
+Source44:     http://drupal.org/files/projects/textile-%{V_module_textile}.tar.gz
+Source45:     http://drupal.org/files/projects/theme_editor-%{V_module_theme_editor}.tar.gz
+Source46:     http://drupal.org/files/projects/tinymce-%{V_module_tinymce}.tar.gz
+Source47:     http://drupal.org/files/projects/urlfilter-%{V_module_urlfilter}.tar.gz
+Source48:     http://drupal.org/files/projects/variable-%{V_module_variable}.tar.gz
+Source49:     http://drupal.org/files/projects/webform-%{V_module_webform}.tar.gz
+Source50:     http://drupal.org/files/projects/webserver_auth-%{V_module_webserver_auth}.tar.gz
+Source51:     http://drupal.org/files/projects/week-%{V_module_week}.tar.gz
+Source52:     http://drupal.org/files/projects/phptemplate-%{V_engine_phptemplate}.tar.gz
+Source53:     http://drupal.org/files/projects/spreadfirefox-%{V_theme_spreadfirefox}.tar.gz
+Source54:     http://drupal.org/files/projects/democratica-%{V_theme_democratica}.tar.gz
 Source100:    drupal-setup.sh
 Source101:    drupal-cron.sh
 Source102:    drupal-apache.conf
@@ -258,6 +320,37 @@ AutoReqProv:  no
     %setup -q -D -T -a 21
     %setup -q -D -T -a 22
     %setup -q -D -T -a 23
+    %setup -q -D -T -a 24
+    %setup -q -D -T -a 25
+    %setup -q -D -T -a 26
+    %setup -q -D -T -a 27
+    %setup -q -D -T -a 28
+    %setup -q -D -T -a 29
+    %setup -q -D -T -a 30
+    %setup -q -D -T -a 31
+    %setup -q -D -T -a 32
+    %setup -q -D -T -a 33
+    %setup -q -D -T -a 34
+    %setup -q -D -T -a 35
+    %setup -q -D -T -a 36
+    %setup -q -D -T -a 37
+    %setup -q -D -T -a 38
+    %setup -q -D -T -a 39
+    %setup -q -D -T -a 40
+    %setup -q -D -T -a 41
+    %setup -q -D -T -a 42
+    %setup -q -D -T -a 43
+    %setup -q -D -T -a 44
+    %setup -q -D -T -a 45
+    %setup -q -D -T -a 46
+    %setup -q -D -T -a 47
+    %setup -q -D -T -a 48
+    %setup -q -D -T -a 49
+    %setup -q -D -T -a 50
+    %setup -q -D -T -a 51
+    %setup -q -D -T -a 52
+    %setup -q -D -T -a 53
+    %setup -q -D -T -a 54
 
 %build
 
@@ -301,17 +394,34 @@ AutoReqProv:  no
        $RPM_BUILD_ROOT%{l_prefix}/share/drupal/modules/extra
     for module in \
         article \
+        attachment \
         buddylist \
         commentcloser \
         customerror \
         contextlinks \
         daily \
+        diff \
         feedback \
+        filemanager \
         flexinode \
         fontsize \
+        forms \
+        form_mail \
+        freelinking \
         front \
+        glossary \
+        hof \
+        htmlarea \
+        image \
         livediscussions \
+        mailalias \
+        mailhandler \
+        members \
+        menu_otf \
         nodewords \
+        nmoderation \
+        node_import \
+        og \
         paypal_framework \
         paypal_subscription \
         quotes \
@@ -319,9 +429,20 @@ AutoReqProv:  no
         series \
         sitemenu \
         smartypants \
+        survey \
+        syndication \
         taxonomy_block \
+        taxonomy_browser \
+        taxonomy_dhtml \
         taxonomy_menu \
+        taxonomy_multi_edit \
         textile \
+        theme_editor \
+        tinymce \
+        urlfilter \
+        variable \
+        webform \
+        webserver_auth \
         week \
     ; do
         ( cd $module
@@ -333,6 +454,26 @@ AutoReqProv:  no
         cp -rp $module $RPM_BUILD_ROOT%{l_prefix}/share/drupal/modules/extra/
     done
 
+    #   install add-on template engine
+    %{l_shtool} mkdir -f -p -m 755 \
+       $RPM_BUILD_ROOT%{l_prefix}/share/drupal/themes/engines/phptemplate
+    ( cd phptemplate
+      cp -p *.engine *.php \
+          $RPM_BUILD_ROOT%{l_prefix}/share/drupal/themes/engines/phptemplate/
+    ) || exit $?
+
+    #   install add-on themes
+    for theme in \
+        spreadfirefox \
+        democratica \
+    ; do
+        ( cd $theme
+          rm -f CHANGELOG* Changelog* CREDITS* INSTALL* LICENSE* README* TODO* || true
+          rm -f */CHANGELOG* */Changelog* */CREDITS* */INSTALL* */LICENSE* */README* */TODO* || true
+        ) || exit $?
+        cp -rp $theme $RPM_BUILD_ROOT%{l_prefix}/share/drupal/themes/
+    done
+
     #   install run-command script
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.drupal} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/