OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Nov-2008 11:56:17
Branch: HEAD Handle: 2008110810561700
Modified files:
openpkg-src/punbb punbb.patch punbb.spec
Log:
upgrading package: punbb 1.3snap20071203 -> 1.3rc2
Summary:
Revision Changes Path
1.2 +33 -89 openpkg-src/punbb/punbb.patch
1.10 +13 -11 openpkg-src/punbb/punbb.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/punbb/punbb.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 punbb.patch
--- openpkg-src/punbb/punbb.patch 16 Apr 2007 20:28:53 -0000 1.1
+++ openpkg-src/punbb/punbb.patch 8 Nov 2008 10:56:17 -0000 1.2
@@ -1,89 +1,33 @@
-Index: upload/include/dblayer/pgsql.php
---- upload/include/dblayer/pgsql.php.orig 2007-04-16 13:57:33 +0200
-+++ upload/include/dblayer/pgsql.php 2007-04-16 22:15:23 +0200
-@@ -146,6 +146,59 @@
- }
-
-
-+ function query_build($query, $unbuffered = false)
-+ {
-+ $sql = '';
-+
-+ if (isset($query['SELECT']))
-+ {
-+ $sql = 'SELECT '.$query['SELECT'].' FROM
'.$this->prefix.$query['FROM'];
-+
-+ if (isset($query['JOINS']))
-+ {
-+ foreach ($query['JOINS'] as $cur_join)
-+ $sql .= ' '.key($cur_join).'
'.$this->prefix.current($cur_join).' ON '.$cur_join['ON'];
-+ }
-+
-+ if (!empty($query['WHERE']))
-+ $sql .= ' WHERE '.$query['WHERE'];
-+ if (!empty($query['GROUP BY']))
-+ $sql .= ' GROUP BY '.$query['GROUP BY'];
-+ if (!empty($query['HAVING']))
-+ $sql .= ' HAVING '.$query['HAVING'];
-+ if (!empty($query['ORDER BY']))
-+ $sql .= ' ORDER BY '.$query['ORDER BY'];
-+ if (!empty($query['LIMIT']))
-+ $sql .= ' LIMIT '.$query['LIMIT'];
-+ }
-+ else if (isset($query['INSERT']))
-+ {
-+ $sql = 'INSERT INTO '.$this->prefix.$query['INTO'];
-+
-+ if (!empty($query['INSERT']))
-+ $sql .= ' ('.$query['INSERT'].')';
-+
-+ $sql .= ' VALUES('.$query['VALUES'].')';
-+ }
-+ else if (isset($query['UPDATE']))
-+ {
-+ $sql = 'UPDATE '.$this->prefix.$query['UPDATE'].' SET
'.$query['SET'];
-+
-+ if (!empty($query['WHERE']))
-+ $sql .= ' WHERE '.$query['WHERE'];
-+ }
-+ else if (isset($query['DELETE']))
-+ {
-+ $sql = 'DELETE FROM '.$this->prefix.$query['DELETE'];
-+
-+ if (!empty($query['WHERE']))
-+ $sql .= ' WHERE '.$query['WHERE'];
-+ }
-+
-+ return $this->query($sql, $unbuffered);
-+ }
-+
-+
- function result($query_id = 0, $row = 0)
- {
- return ($query_id) ? @pg_fetch_result($query_id, $row, 0) :
false;
-Index: upload/install.php
---- upload/install.php.orig 2007-03-17 18:32:58 +0100
-+++ upload/install.php 2007-04-16 22:16:16 +0200
-@@ -175,7 +175,7 @@
- </div>
- <p class="field required">
- <label
for="req_db_name">Database name<em> * <span
class="acchide">(Required)</span></em></label><br />
-- <span class="input"><input
id="req_db_name" type="text" name="req_db_name" size="30" maxlength="50"
/></span>
-+ <span class="input"><input
id="req_db_name" type="text" name="req_db_name" size="30" maxlength="50"
value="punbb"/></span>
- </p>
- <div class="form-info">
- <h2 class="prefix"><span>Step
4: </span></h2>
-@@ -183,11 +183,11 @@
- </div>
- <p class="field">
- <label for="fld3">Database
username</label><br />
-- <span class="input"><input
id="fld3" type="text" name="db_username" size="30" maxlength="50" /></span>
-+ <span class="input"><input
id="fld3" type="text" name="db_username" size="30" maxlength="50"
value="punbb"/></span>
- </p>
- <p class="field">
- <label for="fld4">Database
password</label><br />
-- <span class="input"><input
id="fld4" type="text" name="db_password" size="30" maxlength="50" /></span>
-+ <span class="input"><input
id="fld4" type="text" name="db_password" size="30" maxlength="50"
value="punbb"/></span>
- </p>
- <div class="form-info">
- <h2 class="prefix"><span>Step
5: </span></h2>
+Index: admin/install.php
+--- admin/install.php.orig 2008-10-31 10:36:34 +0100
++++ admin/install.php 2008-11-08 09:42:40 +0100
+@@ -224,25 +224,25 @@
+ <div class="sf-set set2">
+ <div class="sf-box text required">
+ <label for="fld3"><span><?php echo
$lang_install['Database name'] ?> <em><?php echo $lang_install['Required']
?></em></span> <small><?php echo $lang_install['Database name help']
?></small></label><br />
+- <span class="fld-input"><input
id="fld3" type="text" name="req_db_name" size="35" maxlength="50" /></span>
++ <span class="fld-input"><input
id="fld3" type="text" name="req_db_name" size="35" maxlength="50"
value="punbb"/></span>
+ </div>
+ </div>
+ <div class="sf-set set3">
+ <div class="sf-box text">
+ <label for="fld4"><span><?php echo
$lang_install['Database username'] ?></span> <small><?php echo
$lang_install['Database username help'] ?></small></label><br />
+- <span class="fld-input"><input
id="fld4" type="text" name="db_username" size="35" maxlength="50" /></span>
++ <span class="fld-input"><input
id="fld4" type="text" name="db_username" size="35" maxlength="50"
value="punbb"/></span>
+ </div>
+ </div>
+ <div class="sf-set set4">
+ <div class="sf-box text">
+ <label for="fld5"><span><?php echo
$lang_install['Database password'] ?></span> <small><?php echo
$lang_install['Database password help'] ?></small></label><br />
+- <span class="fld-input"><input
id="fld5" type="password" name="db_password" size="35" /></span>
++ <span class="fld-input"><input
id="fld5" type="password" name="db_password" size="35" value="punbb"/></span>
+ </div>
+ </div>
+ <div class="sf-set set5">
+ <div class="sf-box text">
+ <label for="fld6"><span><?php echo
$lang_install['Table prefix'] ?></span> <small><?php echo $lang_install['Table
prefix help'] ?></small></label><br />
+- <span class="fld-input"><input
id="fld6" type="text" name="db_prefix" size="20" maxlength="30" /></span>
++ <span class="fld-input"><input
id="fld6" type="text" name="db_prefix" size="20" maxlength="30"
value=""/></span>
+ </div>
+ </div>
+ </fieldset>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/punbb/punbb.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 punbb.spec
--- openpkg-src/punbb/punbb.spec 1 Jan 2008 15:03:15 -0000 1.9
+++ openpkg-src/punbb/punbb.spec 8 Nov 2008 10:56:17 -0000 1.10
@@ -21,6 +21,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_opkg 1.3rc2
+%define V_dist 1.3-RC2
+
# package information
Name: punbb
Summary: Web Discussion Board
@@ -31,11 +35,11 @@
Class: EVAL
Group: CMS
License: GPL
-Version: 1.3snap20071203
-Release: 20080101
+Version: %{V_opkg}
+Release: 20081108
# list of sources
-Source0: ftp://ftp.openpkg.org/sources/CPY/punbb/punbb-%{version}.tar.gz
+Source0: http://punbb.informer.com/download/punbb-%{V_dist}.tar.gz
Source1: punbb-apache.conf
Source2: punbb-setup.sh
Source3: rc.punbb
@@ -67,13 +71,13 @@
%track
prog punbb = {
- version = %{version}
- url = ftp://ftp.openpkg.org/sources/CPY/punbb/
- regex = punbb-(\d+\.\d+snap\d+)\.tar\.gz
+ version = %{V_dist}
+ url = http://punbb.informer.com/downloads.php
+ regex = punbb-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n punbb
+ %setup -q -n punbb-%{V_dist}
%patch -p0
%build
@@ -91,11 +95,9 @@
$RPM_BUILD_ROOT%{l_prefix}/var/punbb/run
# install main program files
- %{l_shtool} subst %{l_value -s -a} \
- upload/install.php
find . -name ".svn" -type d -print | xargs rm -rf
- cp -rp upload/* $RPM_BUILD_ROOT%{l_prefix}/lib/punbb/
- cp -p extras/.htaccess $RPM_BUILD_ROOT%{l_prefix}/lib/punbb/
+ cp -rp * $RPM_BUILD_ROOT%{l_prefix}/lib/punbb/
+ cp -p .htaccess.dist $RPM_BUILD_ROOT%{l_prefix}/lib/punbb/.htaccess
# install setup script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
