Przeglądaj źródła

upgrading package: drupal 4.6.9 -> 4.7.3

Thomas Lotterer 19 lat temu
rodzic
commit
b258d248a5
2 zmienionych plików z 82 dodań i 385 usunięć
  1. 2 35
      drupal/drupal-setup.sh
  2. 80 350
      drupal/drupal.spec

+ 2 - 35
drupal/drupal-setup.sh

@@ -22,48 +22,15 @@ EOF
 
 #   import Drupal modules extra database schema (requires manual sorting)
 for m in  \
-    attachment/attachment.mysql \
-    banner/banner.mysql \
     bookmarks/bookmarks.mysql \
-    buddylist/buddylist.mysql \
     daily/daily.mysql \
     event/event.mysql \
-    filemanager/filemanager.mysql \
-    filestore2/filestore2.mysql \
-    flexinode/flexinode.mysql \
-    forms/forms.mysql \
-    fscache/fscache.mysql \
-    helpedit/helpedit.mysql \
-    mailhandler/mailhandler.mysql \
-    nmoderation/nmoderation.mysql \
-    nodevote/nodevote.mysql \
+    freelinking/freelinking.mysql \
     nodewords/nodewords.mysql \
-    notify/notify.mysql \
-    og/contrib/og_book/og_book.mysql \
-    og/contrib/og_civicrm/og_civicrm.mysql \
-    og/og.mysql \
-    paypal_framework/paypal_framework.mysql \
-    paypal_subscription/paypal_subscription.mysql \
-    project/project.mysql \
-    rsvp/rsvp.mysql \
-    scheduler/scheduler.mysql \
     shoutbox/shoutbox.mysql \
-    sidecontent/sidecontent.mysql \
-    simplenews/simplenews.mysql \
-    smileys/smileys.mysql \
-    smileys/examples.mysql \
-    spam/spam.mysql \
-    spam/spam_surbl/spam_surbl.mysql \
-    spam/contributed/custom_filters/teledyn.mysql \
-    spam/contributed/spam_tokens/kerneltrap.mysql \
     subscriptions/subscriptions.mysql \
-    survey/survey.mysql \
     taxonomy_block/taxonomy_block.mysql \
-    tinymce/tinymce.mysql \
     trackback/trackback.mysql \
-    troll/troll.mysql \
-    webform/webform.mysql \
-    weblink/weblink.mysql \
     wordfilter/wordfilter.mysql \
 ; do
     @l_prefix@/bin/mysql --user=$username --password=$password drupal \
@@ -73,6 +40,6 @@ done
 
 #  configure /etc/drupal/default/settings.php accordingly
 @l_prefix@/lib/openpkg/shtool subst \
-    -e '/^\$db_url =/s;mysql://username:password@localhost/database;mysql://drupal:drupal@localhost/drupal;' \
+    -e '/^\$db_url =/s;mysql://username:password@localhost/databasename;mysql://drupal:drupal@localhost/drupal;' \
     @l_prefix@/etc/drupal/sites/default/settings.php
 

+ 80 - 350
drupal/drupal.spec

@@ -23,15 +23,11 @@
 ##
 
 #   package versions
-%define       V_drupal_major               4.6
-%define       V_drupal                     4.6.9
-%define       V_engine_phptemplate         %{V_drupal_major}.0
+%define       V_drupal_major               4.7
+%define       V_drupal                     4.7.3
 %define       V_module_adminblock          %{V_drupal_major}.0
 %define       V_module_adsense             %{V_drupal_major}.0
 %define       V_module_article             %{V_drupal_major}.0
-%define       V_module_attachment          %{V_drupal_major}.0
-%define       V_module_banner              %{V_drupal_major}.0
-%define       V_module_blogtheme           %{V_drupal_major}.0
 %define       V_module_bookmarks           %{V_drupal_major}.0
 %define       V_module_buddylist           %{V_drupal_major}.0
 %define       V_module_codefilter          %{V_drupal_major}.0
@@ -39,59 +35,42 @@
 %define       V_module_contextlinks        %{V_drupal_major}.0
 %define       V_module_customerror         %{V_drupal_major}.0
 %define       V_module_daily               %{V_drupal_major}.0
-%define       V_module_diff                %{V_drupal_major}.0
 %define       V_module_event               %{V_drupal_major}.0
 %define       V_module_excerpt             %{V_drupal_major}.0
 %define       V_module_feedback            %{V_drupal_major}.0
-%define       V_module_filemanager         %{V_drupal_major}.0
-%define       V_module_filestore2          %{V_drupal_major}.0
 %define       V_module_flexinode           %{V_drupal_major}.0
-%define       V_module_form_mail           %{V_drupal_major}.0
 %define       V_module_forms               %{V_drupal_major}.0
 %define       V_module_freelinking         %{V_drupal_major}.0
 %define       V_module_front               %{V_drupal_major}.0
-%define       V_module_fscache             %{V_drupal_major}.0
 %define       V_module_glossary            %{V_drupal_major}.0
-%define       V_module_helpedit            %{V_drupal_major}.0
-%define       V_module_highlight           %{V_drupal_major}.0
 %define       V_module_hof                 %{V_drupal_major}.0
-%define       V_module_htmlarea            %{V_drupal_major}.0
 %define       V_module_image               %{V_drupal_major}.0
 %define       V_module_indexpage           %{V_drupal_major}.0
 %define       V_module_interwiki           %{V_drupal_major}.0
 %define       V_module_jsdomenu            %{V_drupal_major}.0
 %define       V_module_legal               %{V_drupal_major}.0
 %define       V_module_livediscussions     %{V_drupal_major}.0
-%define       V_module_mail                %{V_drupal_major}.0
 %define       V_module_mailalias           %{V_drupal_major}.0
 %define       V_module_mailhandler         %{V_drupal_major}.0
-%define       V_module_members             %{V_drupal_major}.0
-%define       V_module_menu_otf            %{V_drupal_major}.0
 %define       V_module_nmoderation         %{V_drupal_major}.0
-%define       V_module_node_import         %{V_drupal_major}.0
 %define       V_module_nodevote            %{V_drupal_major}.0
 %define       V_module_nodewords           %{V_drupal_major}.0
 %define       V_module_notify              %{V_drupal_major}.0
 %define       V_module_og                  %{V_drupal_major}.0
 %define       V_module_paypal_framework    %{V_drupal_major}.0
-%define       V_module_paypal_subscription %{V_drupal_major}.0
 %define       V_module_print               %{V_drupal_major}.0
 %define       V_module_project             %{V_drupal_major}.0
 %define       V_module_quotes              %{V_drupal_major}.0
 %define       V_module_rsvp                %{V_drupal_major}.0
 %define       V_module_scheduler           %{V_drupal_major}.0
 %define       V_module_securesite          %{V_drupal_major}.0
-%define       V_module_series              %{V_drupal_major}.0
 %define       V_module_shoutbox            %{V_drupal_major}.0
-%define       V_module_sidecontent         %{V_drupal_major}.0
 %define       V_module_simplenews          %{V_drupal_major}.0
 %define       V_module_sitemap             %{V_drupal_major}.0
 %define       V_module_sitemenu            %{V_drupal_major}.0
 %define       V_module_smartypants         %{V_drupal_major}.0
 %define       V_module_smileys             %{V_drupal_major}.0
-%define       V_module_spam                %{V_drupal_major}.0
 %define       V_module_subscriptions       %{V_drupal_major}.0
-%define       V_module_summary             %{V_drupal_major}.0
 %define       V_module_survey              %{V_drupal_major}.0
 %define       V_module_syndication         %{V_drupal_major}.0
 %define       V_module_taxonomy_block      %{V_drupal_major}.0
@@ -99,25 +78,18 @@
 %define       V_module_taxonomy_context    %{V_drupal_major}.0
 %define       V_module_taxonomy_dhtml      %{V_drupal_major}.0
 %define       V_module_taxonomy_menu       %{V_drupal_major}.0
-%define       V_module_taxonomy_multi_edit %{V_drupal_major}.0
 %define       V_module_taxonomy_theme      %{V_drupal_major}.0
 %define       V_module_taxonomy_xml        %{V_drupal_major}.0
 %define       V_module_textile             %{V_drupal_major}.0
-%define       V_module_theme_editor        %{V_drupal_major}.0
 %define       V_module_tinymce             %{V_drupal_major}.0
 %define       V_module_trackback           %{V_drupal_major}.0
 %define       V_module_troll               %{V_drupal_major}.0
 %define       V_module_urlfilter           %{V_drupal_major}.0
-%define       V_module_variable            %{V_drupal_major}.0
-%define       V_module_vimcolor            %{V_drupal_major}.0
 %define       V_module_webform             %{V_drupal_major}.0
-%define       V_module_weblink             %{V_drupal_major}.0
 %define       V_module_webserver_auth      %{V_drupal_major}.0
 %define       V_module_week                %{V_drupal_major}.0
-%define       V_module_wiki                %{V_drupal_major}.0
 %define       V_module_wordfilter          %{V_drupal_major}.0
 %define       V_module_workspace           %{V_drupal_major}.0
-%define       V_theme_democratica          %{V_drupal_major}.0
 %define       V_theme_friendselectric      %{V_drupal_major}.0
 %define       V_theme_kubrick              %{V_drupal_major}.0
 %define       V_theme_spreadfirefox        %{V_drupal_major}.0
@@ -133,106 +105,78 @@ Class:        PLUS
 Group:        CMS
 License:      GPL
 Version:      %{V_drupal}
-Release:      20061013
+Release:      20061016
 
 #   list of sources
 Source0:      http://ftp.osuosl.org/pub/drupal/files/projects/drupal-%{V_drupal}.tar.gz
-Source1:      http://ftp.osuosl.org/pub/drupal/files/projects/phptemplate-%{V_engine_phptemplate}.tar.gz
-Source2:      http://ftp.osuosl.org/pub/drupal/files/projects/adminblock-%{V_module_adminblock}.tar.gz
-Source3:      http://ftp.osuosl.org/pub/drupal/files/projects/adsense-%{V_module_adsense}.tar.gz
-Source4:      http://ftp.osuosl.org/pub/drupal/files/projects/article-%{V_module_article}.tar.gz
-Source5:      http://ftp.osuosl.org/pub/drupal/files/projects/attachment-%{V_module_attachment}.tar.gz
-Source6:      http://ftp.osuosl.org/pub/drupal/files/projects/banner-%{V_module_banner}.tar.gz
-Source7:      http://ftp.osuosl.org/pub/drupal/files/projects/blogtheme-%{V_module_blogtheme}.tar.gz
-Source8:      http://ftp.osuosl.org/pub/drupal/files/projects/bookmarks-%{V_module_bookmarks}.tar.gz
-Source9:      http://ftp.osuosl.org/pub/drupal/files/projects/buddylist-%{V_module_buddylist}.tar.gz
-Source10:     http://ftp.osuosl.org/pub/drupal/files/projects/codefilter-%{V_module_codefilter}.tar.gz
-Source11:     http://ftp.osuosl.org/pub/drupal/files/projects/commentcloser-%{V_module_commentcloser}.tar.gz
-Source12:     http://ftp.osuosl.org/pub/drupal/files/projects/contextlinks-%{V_module_contextlinks}.tar.gz
-Source13:     http://ftp.osuosl.org/pub/drupal/files/projects/customerror-%{V_module_customerror}.tar.gz
-Source14:     http://ftp.osuosl.org/pub/drupal/files/projects/daily-%{V_module_daily}.tar.gz
-Source15:     http://ftp.osuosl.org/pub/drupal/files/projects/diff-%{V_module_diff}.tar.gz
-Source16:     http://ftp.osuosl.org/pub/drupal/files/projects/event-%{V_module_event}.tar.gz
-Source17:     http://ftp.osuosl.org/pub/drupal/files/projects/excerpt-%{V_module_excerpt}.tar.gz
-Source18:     http://ftp.osuosl.org/pub/drupal/files/projects/feedback-%{V_module_feedback}.tar.gz
-Source19:     http://ftp.osuosl.org/pub/drupal/files/projects/filemanager-%{V_module_filemanager}.tar.gz
-Source20:     http://ftp.osuosl.org/pub/drupal/files/projects/filestore2-%{V_module_filestore2}.tar.gz
-Source21:     http://ftp.osuosl.org/pub/drupal/files/projects/flexinode-%{V_module_flexinode}.tar.gz
-Source22:     http://ftp.osuosl.org/pub/drupal/files/projects/form_mail-%{V_module_form_mail}.tar.gz
-Source23:     http://ftp.osuosl.org/pub/drupal/files/projects/forms-%{V_module_forms}.tar.gz
-Source24:     http://ftp.osuosl.org/pub/drupal/files/projects/freelinking-%{V_module_freelinking}.tar.gz
-Source25:     http://ftp.osuosl.org/pub/drupal/files/projects/front-%{V_module_front}.tar.gz
-Source26:     http://ftp.osuosl.org/pub/drupal/files/projects/fscache-%{V_module_fscache}.tar.gz
-Source27:     http://ftp.osuosl.org/pub/drupal/files/projects/glossary-%{V_module_glossary}.tar.gz
-Source28:     http://ftp.osuosl.org/pub/drupal/files/projects/helpedit-%{V_module_helpedit}.tar.gz
-Source29:     http://ftp.osuosl.org/pub/drupal/files/projects/highlight-%{V_module_highlight}.tar.gz
-Source30:     http://ftp.osuosl.org/pub/drupal/files/projects/hof-%{V_module_hof}.tar.gz
-Source31:     http://ftp.osuosl.org/pub/drupal/files/projects/htmlarea-%{V_module_htmlarea}.tar.gz
-Source32:     http://ftp.osuosl.org/pub/drupal/files/projects/image-%{V_module_image}.tar.gz
-Source33:     http://ftp.osuosl.org/pub/drupal/files/projects/indexpage-%{V_module_indexpage}.tar.gz
-Source34:     http://ftp.osuosl.org/pub/drupal/files/projects/interwiki-%{V_module_interwiki}.tar.gz
-Source35:     http://ftp.osuosl.org/pub/drupal/files/projects/jsdomenu-%{V_module_jsdomenu}.tar.gz
-Source36:     http://ftp.osuosl.org/pub/drupal/files/projects/legal-%{V_module_legal}.tar.gz
-Source37:     http://ftp.osuosl.org/pub/drupal/files/projects/livediscussions-%{V_module_livediscussions}.tar.gz
-Source38:     http://ftp.osuosl.org/pub/drupal/files/projects/mail-%{V_module_mail}.tar.gz
-Source39:     http://ftp.osuosl.org/pub/drupal/files/projects/mailalias-%{V_module_mailalias}.tar.gz
-Source40:     http://ftp.osuosl.org/pub/drupal/files/projects/mailhandler-%{V_module_mailhandler}.tar.gz
-Source41:     http://ftp.osuosl.org/pub/drupal/files/projects/members-%{V_module_members}.tar.gz
-Source42:     http://ftp.osuosl.org/pub/drupal/files/projects/menu_otf-%{V_module_menu_otf}.tar.gz
-Source43:     http://ftp.osuosl.org/pub/drupal/files/projects/nmoderation-%{V_module_nmoderation}.tar.gz
-Source44:     http://ftp.osuosl.org/pub/drupal/files/projects/node_import-%{V_module_node_import}.tar.gz
-Source45:     http://ftp.osuosl.org/pub/drupal/files/projects/nodevote-%{V_module_nodevote}.tar.gz
-Source46:     http://ftp.osuosl.org/pub/drupal/files/projects/nodewords-%{V_module_nodewords}.tar.gz
-Source47:     http://ftp.osuosl.org/pub/drupal/files/projects/notify-%{V_module_notify}.tar.gz
-Source48:     http://ftp.osuosl.org/pub/drupal/files/projects/og-%{V_module_og}.tar.gz
-Source49:     http://ftp.osuosl.org/pub/drupal/files/projects/paypal_framework-%{V_module_paypal_framework}.tar.gz
-Source50:     http://ftp.osuosl.org/pub/drupal/files/projects/paypal_subscription-%{V_module_paypal_subscription}.tar.gz
-Source51:     http://ftp.osuosl.org/pub/drupal/files/projects/print-%{V_module_print}.tar.gz
-Source52:     http://ftp.osuosl.org/pub/drupal/files/projects/project-%{V_module_project}.tar.gz
-Source53:     http://ftp.osuosl.org/pub/drupal/files/projects/quotes-%{V_module_quotes}.tar.gz
-Source54:     http://ftp.osuosl.org/pub/drupal/files/projects/rsvp-%{V_module_rsvp}.tar.gz
-Source55:     http://ftp.osuosl.org/pub/drupal/files/projects/scheduler-%{V_module_scheduler}.tar.gz
-Source56:     http://ftp.osuosl.org/pub/drupal/files/projects/securesite-%{V_module_securesite}.tar.gz
-Source57:     http://ftp.osuosl.org/pub/drupal/files/projects/series-%{V_module_series}.tar.gz
-Source58:     http://ftp.osuosl.org/pub/drupal/files/projects/shoutbox-%{V_module_shoutbox}.tar.gz
-Source59:     http://ftp.osuosl.org/pub/drupal/files/projects/sidecontent-%{V_module_sidecontent}.tar.gz
-Source60:     http://ftp.osuosl.org/pub/drupal/files/projects/simplenews-%{V_module_simplenews}.tar.gz
-Source61:     http://ftp.osuosl.org/pub/drupal/files/projects/site_map-%{V_module_sitemap}.tar.gz
-Source62:     http://ftp.osuosl.org/pub/drupal/files/projects/sitemenu-%{V_module_sitemenu}.tar.gz
-Source63:     http://ftp.osuosl.org/pub/drupal/files/projects/smartypants-%{V_module_smartypants}.tar.gz
-Source64:     http://ftp.osuosl.org/pub/drupal/files/projects/smileys-%{V_module_smileys}.tar.gz
-Source65:     http://ftp.osuosl.org/pub/drupal/files/projects/spam-%{V_module_spam}.tar.gz
-Source66:     http://ftp.osuosl.org/pub/drupal/files/projects/subscriptions-%{V_module_subscriptions}.tar.gz
-Source67:     http://ftp.osuosl.org/pub/drupal/files/projects/summary-%{V_module_summary}.tar.gz
-Source68:     http://ftp.osuosl.org/pub/drupal/files/projects/survey-%{V_module_survey}.tar.gz
-Source69:     http://ftp.osuosl.org/pub/drupal/files/projects/syndication-%{V_module_syndication}.tar.gz
-Source70:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_block-%{V_module_taxonomy_block}.tar.gz
-Source71:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_browser-%{V_module_taxonomy_browser}.tar.gz
-Source72:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_context-%{V_module_taxonomy_context}.tar.gz
-Source73:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_dhtml-%{V_module_taxonomy_dhtml}.tar.gz
-Source74:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_menu-%{V_module_taxonomy_menu}.tar.gz
-Source75:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_multi_edit-%{V_module_taxonomy_multi_edit}.tar.gz
-Source76:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_theme-%{V_module_taxonomy_theme}.tar.gz
-Source77:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_xml-%{V_module_taxonomy_xml}.tar.gz
-Source78:     http://ftp.osuosl.org/pub/drupal/files/projects/textile-%{V_module_textile}.tar.gz
-Source79:     http://ftp.osuosl.org/pub/drupal/files/projects/theme_editor-%{V_module_theme_editor}.tar.gz
-Source80:     http://ftp.osuosl.org/pub/drupal/files/projects/tinymce-%{V_module_tinymce}.tar.gz
-Source81:     http://ftp.osuosl.org/pub/drupal/files/projects/trackback-%{V_module_trackback}.tar.gz
-Source82:     http://ftp.osuosl.org/pub/drupal/files/projects/troll-%{V_module_troll}.tar.gz
-Source83:     http://ftp.osuosl.org/pub/drupal/files/projects/urlfilter-%{V_module_urlfilter}.tar.gz
-Source84:     http://ftp.osuosl.org/pub/drupal/files/projects/variable-%{V_module_variable}.tar.gz
-Source85:     http://ftp.osuosl.org/pub/drupal/files/projects/vimcolor-%{V_module_vimcolor}.tar.gz
-Source86:     http://ftp.osuosl.org/pub/drupal/files/projects/webform-%{V_module_webform}.tar.gz
-Source87:     http://ftp.osuosl.org/pub/drupal/files/projects/weblink-%{V_module_weblink}.tar.gz
-Source88:     http://ftp.osuosl.org/pub/drupal/files/projects/webserver_auth-%{V_module_webserver_auth}.tar.gz
-Source89:     http://ftp.osuosl.org/pub/drupal/files/projects/week-%{V_module_week}.tar.gz
-Source90:     http://ftp.osuosl.org/pub/drupal/files/projects/wiki-%{V_module_wiki}.tar.gz
-Source91:     http://ftp.osuosl.org/pub/drupal/files/projects/wordfilter-%{V_module_wordfilter}.tar.gz
-Source92:     http://ftp.osuosl.org/pub/drupal/files/projects/workspace-%{V_module_workspace}.tar.gz
-Source93:     http://ftp.osuosl.org/pub/drupal/files/projects/democratica-%{V_theme_democratica}.tar.gz
-Source94:     http://ftp.osuosl.org/pub/drupal/files/projects/friendselectric-%{V_theme_friendselectric}.tar.gz
-Source95:     http://ftp.osuosl.org/pub/drupal/files/projects/kubrick-%{V_theme_kubrick}.tar.gz
-Source96:     http://ftp.osuosl.org/pub/drupal/files/projects/spreadfirefox-%{V_theme_spreadfirefox}.tar.gz
+Source1:      http://ftp.osuosl.org/pub/drupal/files/projects/adminblock-%{V_module_adminblock}.tar.gz
+Source2:      http://ftp.osuosl.org/pub/drupal/files/projects/adsense-%{V_module_adsense}.tar.gz
+Source3:      http://ftp.osuosl.org/pub/drupal/files/projects/article-%{V_module_article}.tar.gz
+Source4:      http://ftp.osuosl.org/pub/drupal/files/projects/bookmarks-%{V_module_bookmarks}.tar.gz
+Source5:      http://ftp.osuosl.org/pub/drupal/files/projects/buddylist-%{V_module_buddylist}.tar.gz
+Source6:      http://ftp.osuosl.org/pub/drupal/files/projects/codefilter-%{V_module_codefilter}.tar.gz
+Source7:      http://ftp.osuosl.org/pub/drupal/files/projects/commentcloser-%{V_module_commentcloser}.tar.gz
+Source8:      http://ftp.osuosl.org/pub/drupal/files/projects/contextlinks-%{V_module_contextlinks}.tar.gz
+Source9:      http://ftp.osuosl.org/pub/drupal/files/projects/customerror-%{V_module_customerror}.tar.gz
+Source10:     http://ftp.osuosl.org/pub/drupal/files/projects/daily-%{V_module_daily}.tar.gz
+Source11:     http://ftp.osuosl.org/pub/drupal/files/projects/event-%{V_module_event}.tar.gz
+Source12:     http://ftp.osuosl.org/pub/drupal/files/projects/excerpt-%{V_module_excerpt}.tar.gz
+Source13:     http://ftp.osuosl.org/pub/drupal/files/projects/feedback-%{V_module_feedback}.tar.gz
+Source14:     http://ftp.osuosl.org/pub/drupal/files/projects/flexinode-%{V_module_flexinode}.tar.gz
+Source15:     http://ftp.osuosl.org/pub/drupal/files/projects/forms-%{V_module_forms}.tar.gz
+Source16:     http://ftp.osuosl.org/pub/drupal/files/projects/freelinking-%{V_module_freelinking}.tar.gz
+Source17:     http://ftp.osuosl.org/pub/drupal/files/projects/front-%{V_module_front}.tar.gz
+Source18:     http://ftp.osuosl.org/pub/drupal/files/projects/glossary-%{V_module_glossary}.tar.gz
+Source19:     http://ftp.osuosl.org/pub/drupal/files/projects/hof-%{V_module_hof}.tar.gz
+Source20:     http://ftp.osuosl.org/pub/drupal/files/projects/image-%{V_module_image}.tar.gz
+Source21:     http://ftp.osuosl.org/pub/drupal/files/projects/indexpage-%{V_module_indexpage}.tar.gz
+Source22:     http://ftp.osuosl.org/pub/drupal/files/projects/interwiki-%{V_module_interwiki}.tar.gz
+Source23:     http://ftp.osuosl.org/pub/drupal/files/projects/jsdomenu-%{V_module_jsdomenu}.tar.gz
+Source24:     http://ftp.osuosl.org/pub/drupal/files/projects/legal-%{V_module_legal}.tar.gz
+Source25:     http://ftp.osuosl.org/pub/drupal/files/projects/livediscussions-%{V_module_livediscussions}.tar.gz
+Source26:     http://ftp.osuosl.org/pub/drupal/files/projects/mailalias-%{V_module_mailalias}.tar.gz
+Source27:     http://ftp.osuosl.org/pub/drupal/files/projects/mailhandler-%{V_module_mailhandler}.tar.gz
+Source28:     http://ftp.osuosl.org/pub/drupal/files/projects/nmoderation-%{V_module_nmoderation}.tar.gz
+Source29:     http://ftp.osuosl.org/pub/drupal/files/projects/nodevote-%{V_module_nodevote}.tar.gz
+Source30:     http://ftp.osuosl.org/pub/drupal/files/projects/nodewords-%{V_module_nodewords}.tar.gz
+Source31:     http://ftp.osuosl.org/pub/drupal/files/projects/notify-%{V_module_notify}.tar.gz
+Source32:     http://ftp.osuosl.org/pub/drupal/files/projects/og-%{V_module_og}.tar.gz
+Source33:     http://ftp.osuosl.org/pub/drupal/files/projects/paypal_framework-%{V_module_paypal_framework}.tar.gz
+Source34:     http://ftp.osuosl.org/pub/drupal/files/projects/print-%{V_module_print}.tar.gz
+Source35:     http://ftp.osuosl.org/pub/drupal/files/projects/project-%{V_module_project}.tar.gz
+Source36:     http://ftp.osuosl.org/pub/drupal/files/projects/quotes-%{V_module_quotes}.tar.gz
+Source37:     http://ftp.osuosl.org/pub/drupal/files/projects/rsvp-%{V_module_rsvp}.tar.gz
+Source38:     http://ftp.osuosl.org/pub/drupal/files/projects/scheduler-%{V_module_scheduler}.tar.gz
+Source39:     http://ftp.osuosl.org/pub/drupal/files/projects/securesite-%{V_module_securesite}.tar.gz
+Source40:     http://ftp.osuosl.org/pub/drupal/files/projects/shoutbox-%{V_module_shoutbox}.tar.gz
+Source41:     http://ftp.osuosl.org/pub/drupal/files/projects/simplenews-%{V_module_simplenews}.tar.gz
+Source42:     http://ftp.osuosl.org/pub/drupal/files/projects/site_map-%{V_module_sitemap}.tar.gz
+Source43:     http://ftp.osuosl.org/pub/drupal/files/projects/sitemenu-%{V_module_sitemenu}.tar.gz
+Source44:     http://ftp.osuosl.org/pub/drupal/files/projects/smartypants-%{V_module_smartypants}.tar.gz
+Source45:     http://ftp.osuosl.org/pub/drupal/files/projects/smileys-%{V_module_smileys}.tar.gz
+Source46:     http://ftp.osuosl.org/pub/drupal/files/projects/subscriptions-%{V_module_subscriptions}.tar.gz
+Source47:     http://ftp.osuosl.org/pub/drupal/files/projects/survey-%{V_module_survey}.tar.gz
+Source48:     http://ftp.osuosl.org/pub/drupal/files/projects/syndication-%{V_module_syndication}.tar.gz
+Source49:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_block-%{V_module_taxonomy_block}.tar.gz
+Source50:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_browser-%{V_module_taxonomy_browser}.tar.gz
+Source51:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_context-%{V_module_taxonomy_context}.tar.gz
+Source52:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_dhtml-%{V_module_taxonomy_dhtml}.tar.gz
+Source53:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_menu-%{V_module_taxonomy_menu}.tar.gz
+Source54:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_theme-%{V_module_taxonomy_theme}.tar.gz
+Source55:     http://ftp.osuosl.org/pub/drupal/files/projects/taxonomy_xml-%{V_module_taxonomy_xml}.tar.gz
+Source56:     http://ftp.osuosl.org/pub/drupal/files/projects/textile-%{V_module_textile}.tar.gz
+Source57:     http://ftp.osuosl.org/pub/drupal/files/projects/tinymce-%{V_module_tinymce}.tar.gz
+Source58:     http://ftp.osuosl.org/pub/drupal/files/projects/trackback-%{V_module_trackback}.tar.gz
+Source59:     http://ftp.osuosl.org/pub/drupal/files/projects/troll-%{V_module_troll}.tar.gz
+Source60:     http://ftp.osuosl.org/pub/drupal/files/projects/urlfilter-%{V_module_urlfilter}.tar.gz
+Source61:     http://ftp.osuosl.org/pub/drupal/files/projects/webform-%{V_module_webform}.tar.gz
+Source62:     http://ftp.osuosl.org/pub/drupal/files/projects/webserver_auth-%{V_module_webserver_auth}.tar.gz
+Source63:     http://ftp.osuosl.org/pub/drupal/files/projects/week-%{V_module_week}.tar.gz
+Source64:     http://ftp.osuosl.org/pub/drupal/files/projects/wordfilter-%{V_module_wordfilter}.tar.gz
+Source65:     http://ftp.osuosl.org/pub/drupal/files/projects/workspace-%{V_module_workspace}.tar.gz
+Source66:     http://ftp.osuosl.org/pub/drupal/files/projects/friendselectric-%{V_theme_friendselectric}.tar.gz
+Source67:     http://ftp.osuosl.org/pub/drupal/files/projects/kubrick-%{V_theme_kubrick}.tar.gz
+Source68:     http://ftp.osuosl.org/pub/drupal/files/projects/spreadfirefox-%{V_theme_spreadfirefox}.tar.gz
 Source100:    drupal-setup.sh
 Source101:    drupal-cron.sh
 Source102:    drupal-apache.conf
@@ -243,13 +187,15 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823
 PreReq:       OpenPKG, openpkg >= 20060823
-PreReq:       apache
+PreReq:       apache, pcre
 PreReq:       apache::with_mod_php = yes
 PreReq:       apache::with_mod_php_gd = yes
+PreReq:       apache::with_mod_php_mbstring = yes
 PreReq:       apache::with_mod_php_mm = yes
 PreReq:       apache::with_mod_php_mysql = yes
 PreReq:       apache::with_mod_php_pcre = yes
 PreReq:       apache::with_mod_php_xml = yes
+PreReq:       pcre::with_utf8
 AutoReq:      no
 AutoReqProv:  no
 
@@ -266,11 +212,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = drupal-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:phptemplate = {
-        version   = %{V_engine_phptemplate}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = phptemplate-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:adminblock = {
         version   = %{V_module_adminblock}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -286,21 +227,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = article-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:attachment = {
-        version   = %{V_module_attachment}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = attachment-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:banner = {
-        version   = %{V_module_banner}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = banner-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:blogtheme = {
-        version   = %{V_module_blogtheme}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = blogtheme-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:bookmarks = {
         version   = %{V_module_bookmarks}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -336,11 +262,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = daily-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:diff = {
-        version   = %{V_module_diff}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = diff-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:event = {
         version   = %{V_module_event}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -356,26 +277,11 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = feedback-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:filemanager = {
-        version   = %{V_module_filemanager}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = filemanager-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:filestore2 = {
-        version   = %{V_module_filestore2}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = filestore2-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:flexinode = {
         version   = %{V_module_flexinode}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = flexinode-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:form_mail = {
-        version   = %{V_module_form_mail}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = form_mail-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:forms = {
         version   = %{V_module_forms}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -391,36 +297,16 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = front-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:fscache = {
-        version   = %{V_module_fscache}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = fscache-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:glossary = {
         version   = %{V_module_glossary}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = glossary-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:helpedit = {
-        version   = %{V_module_helpedit}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = helpedit-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:highlight = {
-        version   = %{V_module_highlight}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = highlight-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:hof = {
         version   = %{V_module_hof}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = hof-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:htmlarea = {
-        version   = %{V_module_htmlarea}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = htmlarea-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:image = {
         version   = %{V_module_image}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -451,11 +337,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = livediscussions-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:mail = {
-        version   = %{V_module_mail}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = mail-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:mailalias = {
         version   = %{V_module_mailalias}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -466,26 +347,11 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = mailhandler-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:members = {
-        version   = %{V_module_members}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = members-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:menu_otf = {
-        version   = %{V_module_menu_otf}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = menu_otf-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:nmoderation = {
         version   = %{V_module_nmoderation}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = nmoderation-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:node_import = {
-        version   = %{V_module_node_import}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = node_import-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:nodevote = {
         version   = %{V_module_nodevote}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -511,11 +377,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = paypal_framework-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:paypal_subscription = {
-        version   = %{V_module_paypal_subscription}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = paypal_subscription-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:print = {
         version   = %{V_module_print}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -546,21 +407,11 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = securesite-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:series = {
-        version   = %{V_module_series}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = series-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:shoutbox = {
         version   = %{V_module_shoutbox}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = shoutbox-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:sidecontent = {
-        version   = %{V_module_sidecontent}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = sidecontent-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:simplenews = {
         version   = %{V_module_simplenews}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -586,21 +437,11 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = smileys-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:spam = {
-        version   = %{V_module_spam}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = spam-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:subscriptions = {
         version   = %{V_module_subscriptions}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = subscriptions-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:summary = {
-        version   = %{V_module_summary}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = summary-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:survey = {
         version   = %{V_module_survey}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -636,11 +477,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = taxonomy_menu-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:taxonomy_multi_edit = {
-        version   = %{V_module_taxonomy_multi_edit}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = taxonomy_multi_edit-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:taxonomy_theme = {
         version   = %{V_module_taxonomy_theme}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -656,11 +492,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = textile-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:theme_editor = {
-        version   = %{V_module_theme_editor}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = theme_editor-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:tinymce = {
         version   = %{V_module_tinymce}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -681,26 +512,11 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = urlfilter-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:variable = {
-        version   = %{V_module_variable}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = variable-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
-    prog drupal:vimcolor = {
-        version   = %{V_module_vimcolor}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = vimcolor-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:webform = {
         version   = %{V_module_webform}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = webform-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:weblink = {
-        version   = %{V_module_weblink}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = weblink-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:webserver_auth = {
         version   = %{V_module_webserver_auth}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -711,11 +527,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = week-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:wiki = {
-        version   = %{V_module_wiki}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = wiki-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:wordfilter = {
         version   = %{V_module_wordfilter}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -726,11 +537,6 @@ AutoReqProv:  no
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
         regex     = workspace-(%{V_drupal_major}\.\d+)\.tar\.gz
     }
-    prog drupal:democratica = {
-        version   = %{V_theme_democratica}
-        url       = http://ftp.osuosl.org/pub/drupal/files/projects/
-        regex     = democratica-(%{V_drupal_major}\.\d+)\.tar\.gz
-    }
     prog drupal:friendselectric = {
         version   = %{V_theme_friendselectric}
         url       = http://ftp.osuosl.org/pub/drupal/files/projects/
@@ -817,34 +623,6 @@ AutoReqProv:  no
     %setup -q -D -T -a 66
     %setup -q -D -T -a 67
     %setup -q -D -T -a 68
-    %setup -q -D -T -a 69
-    %setup -q -D -T -a 70
-    %setup -q -D -T -a 71
-    %setup -q -D -T -a 72
-    %setup -q -D -T -a 73
-    %setup -q -D -T -a 74
-    %setup -q -D -T -a 75
-    %setup -q -D -T -a 76
-    %setup -q -D -T -a 77
-    %setup -q -D -T -a 78
-    %setup -q -D -T -a 79
-    %setup -q -D -T -a 80
-    %setup -q -D -T -a 81
-    %setup -q -D -T -a 82
-    %setup -q -D -T -a 83
-    %setup -q -D -T -a 84
-    %setup -q -D -T -a 85
-    %setup -q -D -T -a 86
-    %setup -q -D -T -a 87
-    %setup -q -D -T -a 88
-    %setup -q -D -T -a 89
-    %setup -q -D -T -a 90
-    %setup -q -D -T -a 91
-    %setup -q -D -T -a 92
-    %setup -q -D -T -a 93
-    %setup -q -D -T -a 94
-    %setup -q -D -T -a 95
-    %setup -q -D -T -a 96
 
 %build
 
@@ -865,7 +643,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/share/drupal/
     ( cd $RPM_BUILD_ROOT%{l_prefix}/share/drupal
       rm -f .htaccess
-      rm -f database/database.pgsql
+      rm -f database/database.pgsql database/database.4.0.mysql
+      mv database/database.4.1.mysql database/database.mysql
       rm -rf scripts
       rm -f [A-Z]*.txt
       chmod a-x modules/*.module
@@ -873,20 +652,6 @@ AutoReqProv:  no
 
     #   adjust database
     (
-      echo '-- adjust default theme because vendor default "blumarine"'
-      echo '-- uses template engine XTemplate which, as of Drupal'
-      echo '-- 4.6.x, is incompatible to PHP 5.0.5+/5.1.1+'
-      echo '-- see http://drupal.org/node/42080'
-      echo '--'
-      echo "INSERT INTO system VALUES ('themes/chameleon/chameleon.theme','chameleon','theme','themes/chameleon/chameleon.theme',0,0,0);";
-      echo "REPLACE variable SET name = 'theme_default', value = 's:9:\\\"chameleon\\\";';"
-      echo "UPDATE system SET status = 0 WHERE (type = 'theme' AND description LIKE '%xtemplate.engine%');"
-      echo "UPDATE system SET status = 1 WHERE (type = 'theme' AND name = 'chameleon');"
-      echo ''
-      echo '-- set tmp directory required for gd operations'
-      echo '--'
-      echo "REPLACE variable SET name = 'file_directory_temp', value = 's:3:\\\"tmp\\\";';"
-      echo ''
       echo '-- OpenPKG branding'
       echo '--'
       echo "REPLACE variable SET name = 'site_footer', value = 's:56:\\\"powered by <a href=\\\"http://www.openpkg.org/\\\">OpenPKG</a>\\\";';"
@@ -910,92 +675,66 @@ AutoReqProv:  no
         adminblock \
         adsense \
         article \
-        attachment \
-        banner \
-        blogtheme \
         bookmarks \
         buddylist \
         codefilter \
         commentcloser \
-        contextlinks \
         customerror \
+        contextlinks \
         daily \
-        diff \
         event \
         excerpt \
         feedback \
-        filemanager \
-        filestore2 \
         flexinode \
-        form_mail \
         forms \
-        freelinking \
         front \
-        fscache \
+        freelinking \
         glossary \
-        helpedit \
-        highlight \
         hof \
-        htmlarea \
         image \
         indexpage \
         interwiki \
         jsdomenu \
         legal \
         livediscussions \
-        mail \
         mailalias \
         mailhandler \
-        members \
-        menu_otf \
+        nodewords \
         nmoderation \
-        node_import \
         nodevote \
-        nodewords \
         notify \
         og \
         paypal_framework \
-        paypal_subscription \
         print \
         project \
         quotes \
         rsvp \
         scheduler \
         securesite \
-        series \
         shoutbox \
-        sidecontent \
         simplenews \
         site_map \
         sitemenu \
         smartypants \
         smileys \
-        spam \
         subscriptions \
-        summary \
         survey \
         syndication \
         taxonomy_block \
         taxonomy_browser \
         taxonomy_context \
         taxonomy_dhtml \
+        taxonomy_xml \
         taxonomy_menu \
-        taxonomy_multi_edit \
         taxonomy_theme \
-        taxonomy_xml \
         textile \
-        theme_editor \
         tinymce \
         trackback \
         troll \
         urlfilter \
-        variable \
-        vimcolor \
         webform \
-        weblink \
         webserver_auth \
         week \
-        wiki \
         wordfilter \
         workspace \
     ; do
@@ -1008,18 +747,9 @@ 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 \
         friendselectric \
         kubrick \
     ; do