1.1 --- a/drupal/drupal.spec Tue Aug 28 18:28:45 2012 +0200
1.2 +++ b/drupal/drupal.spec Tue Aug 28 18:28:50 2012 +0200
1.3 @@ -31,8 +31,8 @@
1.4 Class: PLUS
1.5 Group: CMS
1.6 License: GPL
1.7 -Version: 6.22
1.8 -Release: 20110526
1.9 +Version: 7.15
1.10 +Release: 20120800
1.11
1.12 # package options
1.13 %option with_mysql yes
1.14 @@ -41,14 +41,14 @@
1.15
1.16 # checking for option conflicts
1.17 %if "%{with_mysql}" == "no" && "%{with_pgsql}" == "no"
1.18 - %{error:one of the build-time options 'with_mysql' or 'with_pgsql' have to be enabled}
1.19 + %{error:one of the buildtime options 'with_mysql' or 'with_pgsql' have to be enabled}
1.20 %endif
1.21 %if "%{with_mysql}" == "yes" && "%{with_pgsql}" == "yes"
1.22 - %{error:only one of the build-time options 'with_mysql' or 'with_pgsql' can be enabled at a time}
1.23 + %{error:only one of the buildtime options 'with_mysql' or 'with_pgsql' can be enabled at a time}
1.24 %endif
1.25
1.26 # list of sources
1.27 -Source0: http://ftp.drupal.org/files/projects/drupal-%{version}.tar.gz
1.28 +Source0: ftp://ftp.drupal.org/pub/drupal/files/projects/drupal-%{version}.tar.gz
1.29 Source1: drupal-setup.sh
1.30 Source2: drupal-cron.sh
1.31 Source3: drupal-apache.conf
1.32 @@ -84,15 +84,15 @@
1.33 %description
1.34 Drupal is a dynamic web site platform which allows an individual
1.35 or community of users to publish, manage and organize a
1.36 - variety of content, Drupal integrates many popular features of
1.37 + variety of content. Drupal integrates many popular features of
1.38 content management systems, weblogs, collaborative tools and
1.39 - discussion-based community software into one easy-to-use package.
1.40 + discussion based community software into one easy to use package.
1.41
1.42 %track
1.43 prog drupal = {
1.44 version = %{version}
1.45 url = http://ftp.drupal.org/files/projects/
1.46 - regex = drupal-(6\.\d+)\.tar\.gz
1.47 + regex = drupal-(\d\.\d+)\.tar\.gz
1.48 }
1.49
1.50 %prep
1.51 @@ -126,21 +126,11 @@
1.52 cp -rp * .htaccess \
1.53 $RPM_BUILD_ROOT%{l_prefix}/share/drupal/
1.54
1.55 - # pre-configure settings.php
1.56 - %{l_shtool} subst \
1.57 -%if "%{with_mysql}" == "yes"
1.58 - -e 's|^\( *\$db_url\) *=.*$|\1 = "mysql://drupal:drupal@127.0.0.1/drupal";|' \
1.59 -%endif
1.60 -%if "%{with_pgsql}" == "yes"
1.61 - -e 's|^\( *\$db_url\) *=.*$|\1 = "pgsql://drupal:drupal@127.0.0.1/drupal";|' \
1.62 -%endif
1.63 - $RPM_BUILD_ROOT%{l_prefix}/share/drupal/sites/default/default.settings.php
1.64 -
1.65 # set data location
1.66 ln -s ../../../../var/drupal/files \
1.67 $RPM_BUILD_ROOT%{l_prefix}/share/drupal/sites/default/files
1.68
1.69 - # install run-command script
1.70 + # install runcommand script
1.71 %if "%{with_dcron}" == "yes"
1.72 l_drupal_cron="no"
1.73 %else
