OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 19-Sep-2009 08:56:48
Branch: HEAD Handle: 2009091907564701
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
upgrading package: drupal 6.13 -> 6.14
Summary:
Revision Changes Path
1.41 +4 -4 openpkg-src/drupal/drupal.patch
1.497 +4 -7 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.40 -r1.41 drupal.patch
--- openpkg-src/drupal/drupal.patch 8 Jun 2009 17:25:45 -0000 1.40
+++ openpkg-src/drupal/drupal.patch 19 Sep 2009 06:56:47 -0000 1.41
@@ -333,8 +333,8 @@
$block['content'] = $node_title_list;
$block['content'] .= theme('more_link', url('blog'), t('Read the
latest blog entries.'));
Index: modules/blog/blog.pages.inc
---- modules/blog/blog.pages.inc.orig 2008-02-08 22:15:12 +0100
-+++ modules/blog/blog.pages.inc 2008-06-26 17:19:49 +0200
+--- modules/blog/blog.pages.inc.orig 2009-09-14 17:08:00 +0200
++++ modules/blog/blog.pages.inc 2009-09-19 08:53:18 +0200
@@ -25,7 +25,7 @@
$output = theme('item_list', $items);
@@ -359,7 +359,7 @@
function blog_feed_user($account) {
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM
{node} n WHERE n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY
n.created DESC"), $account->uid, 0, variable_get('feed_default_items', 10));
+ $result = db_query_range("SELECT n.nid, n.created FROM {node} n WHERE
n.type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.created DESC",
$account->uid, 0, variable_get('feed_default_items', 10));
- $channel['title'] = $account->name ."'s blog";
+ $channel['title'] = t("!name's blog", array('!name' => $account->name));
$channel['link'] = url('blog/'. $account->uid, array('absolute' => TRUE));
@@ -102,7 +102,7 @@
@@ -368,6 +368,6 @@
function blog_feed_last() {
- $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.created FROM
{node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0,
variable_get('feed_default_items', 10));
+ $result = db_query_range("SELECT n.nid, n.created FROM {node} n WHERE
n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC", 0,
variable_get('feed_default_items', 10));
- $channel['title'] = variable_get('site_name', 'Drupal') .' blogs';
+ $channel['title'] = t('!site_name blogs', array('!site_name' =>
variable_get('site_name', 'Drupal')));
$channel['link'] = url('blog', array('absolute' => TRUE));
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.496 -r1.497 drupal.spec
--- openpkg-src/drupal/drupal.spec 12 Jul 2009 12:50:47 -0000 1.496
+++ openpkg-src/drupal/drupal.spec 19 Sep 2009 06:56:48 -0000 1.497
@@ -21,9 +21,6 @@
## SUCH DAMAGE.
##
-# package versions
-%define V_drupal 6.13
-
# package information
Name: drupal
Summary: Content Management Platform
@@ -34,8 +31,8 @@
Class: PLUS
Group: CMS
License: GPL
-Version: %{V_drupal}
-Release: 20090712
+Version: 6.14
+Release: 20090919
# package options
%option with_mysql yes
@@ -51,7 +48,7 @@
%endif
# list of sources
-Source0: http://ftp.drupal.org/files/projects/drupal-%{V_drupal}.tar.gz
+Source0: http://ftp.drupal.org/files/projects/drupal-%{version}.tar.gz
Source1: drupal-setup.sh
Source2: drupal-cron.sh
Source3: drupal-apache.conf
@@ -97,7 +94,7 @@
%track
prog drupal = {
- version = %{V_drupal}
+ version = %{version}
url = http://ftp.drupal.org/files/projects/
regex = drupal-(6\.\d+)\.tar\.gz
}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
