diff -r 7d4d11d301d6 -r 5cd084e0397a drupal/drupal.spec
--- a/drupal/drupal.spec	Tue Aug 28 18:28:45 2012 +0200
+++ b/drupal/drupal.spec	Tue Aug 28 18:28:50 2012 +0200
@@ -31,8 +31,8 @@
 Class:        PLUS
 Group:        CMS
 License:      GPL
-Version:      6.22
-Release:      20110526
+Version:      7.15
+Release:      20120800
 
 #   package options
 %option       with_mysql   yes
@@ -41,14 +41,14 @@
 
 #   checking for option conflicts
 %if "%{with_mysql}" == "no" && "%{with_pgsql}" == "no"
-    %{error:one of the build-time options 'with_mysql' or 'with_pgsql' have to be enabled}
+    %{error:one of the buildtime options 'with_mysql' or 'with_pgsql' have to be enabled}
 %endif
 %if "%{with_mysql}" == "yes" && "%{with_pgsql}" == "yes"
-    %{error:only one of the build-time options 'with_mysql' or 'with_pgsql' can be enabled at a time}
+    %{error:only one of the buildtime options 'with_mysql' or 'with_pgsql' can be enabled at a time}
 %endif
 
 #   list of sources
-Source0:      http://ftp.drupal.org/files/projects/drupal-%{version}.tar.gz
+Source0:      ftp://ftp.drupal.org/pub/drupal/files/projects/drupal-%{version}.tar.gz
 Source1:      drupal-setup.sh
 Source2:      drupal-cron.sh
 Source3:      drupal-apache.conf
@@ -84,15 +84,15 @@
 %description
     Drupal is a dynamic web site platform which allows an individual
     or community of users to publish, manage and organize a
-    variety of content, Drupal integrates many popular features of
+    variety of content. Drupal integrates many popular features of
     content management systems, weblogs, collaborative tools and
-    discussion-based community software into one easy-to-use package.
+    discussion based community software into one easy to use package.
 
 %track
     prog drupal = {
         version   = %{version}
         url       = http://ftp.drupal.org/files/projects/
-        regex     = drupal-(6\.\d+)\.tar\.gz
+        regex     = drupal-(\d\.\d+)\.tar\.gz
     }
 
 %prep
@@ -126,21 +126,11 @@
     cp -rp * .htaccess \
         $RPM_BUILD_ROOT%{l_prefix}/share/drupal/
 
-    #   pre-configure settings.php
-    %{l_shtool} subst \
-%if "%{with_mysql}" == "yes"
-        -e 's|^\( *\$db_url\) *=.*$|\1 = "mysql://drupal:drupal@127.0.0.1/drupal";|' \
-%endif
-%if "%{with_pgsql}" == "yes"
-        -e 's|^\( *\$db_url\) *=.*$|\1 = "pgsql://drupal:drupal@127.0.0.1/drupal";|' \
-%endif
-        $RPM_BUILD_ROOT%{l_prefix}/share/drupal/sites/default/default.settings.php
-
     #   set data location
     ln -s ../../../../var/drupal/files \
         $RPM_BUILD_ROOT%{l_prefix}/share/drupal/sites/default/files
 
-    #   install run-command script
+    #   install runcommand script
 %if "%{with_dcron}" == "yes"
     l_drupal_cron="no"
 %else