packages: dokuwiki-plugin-data/dokuwiki-plugin-data.spec, dokuwiki-plugin-d...

[glen]

Author: glen                         Date: Tue Mar 13 11:36:13 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 20120227; adds %lastmod% filter

---- Files affected:
packages/dokuwiki-plugin-data:
   dokuwiki-plugin-data.spec (1.24 -> 1.25) , separate-rpmdb.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec
diff -u packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.24 packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.25
--- packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.24	Mon Nov  7 06:55:23 2011
+++ packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec	Tue Mar 13 12:36:07 2012
@@ -4,18 +4,17 @@
 %include	/usr/lib/rpm/macros.php
 Summary:	DokuWiki Structured Data Plugin
 Name:		dokuwiki-plugin-%{plugin}
-Version:	20110615
+Version:	20120227
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/zipball/master#/%{plugin}-%{version}.zip
-# Source0-md5:	da92dbb3e7ccf8b960aef716251ca642
+Source0:	http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
+# Source0-md5:	15323c553023012d45fe2f79e6d26a10
 URL:		http://wiki.splitbrain.org/plugin:data
 Patch2:		separator-style.patch
 Patch3:		separate-rpmdb.patch
 BuildRequires:	rpm-php-pearprov
 BuildRequires:	rpmbuild(macros) >= 1.520
-BuildRequires:	unzip
 Requires:	php-common >= 4:%{php_min_version}
 Requires(triggerun):	sqlite
 Requires:	dokuwiki >= 20090214b-5
@@ -114,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2012/03/13 11:36:07  glen
+- up to 20120227; adds %lastmod% filter
+
 Revision 1.24  2011/11/07 05:55:23  glen
 - skip packaging tests
 

================================================================
Index: packages/dokuwiki-plugin-data/separate-rpmdb.patch
diff -u packages/dokuwiki-plugin-data/separate-rpmdb.patch:1.1 packages/dokuwiki-plugin-data/separate-rpmdb.patch:1.2
--- packages/dokuwiki-plugin-data/separate-rpmdb.patch:1.1	Wed Dec  1 19:21:09 2010
+++ packages/dokuwiki-plugin-data/separate-rpmdb.patch	Tue Mar 13 12:36:07 2012
@@ -4,34 +4,37 @@
 in separate table, if it is still a performance problem, we could use
 separate datafile.
 
---- dokuwiki-plugin-data-20100608/db/latest.version	2010-11-03 15:20:30.000000000 +0200
-+++ dokuwiki-plugin-data-20100608/db/latest.version	2010-12-01 19:50:59.214345000 +0200
-@@ -1 +1 @@
--4
-+5
---- dokuwiki-plugin-data-20100608/helper.php	2010-12-01 19:51:15.127904142 +0200
-+++ dokuwiki-plugin-data-20100608/helper.php	2010-12-01 19:50:59.217678000 +0200
-@@ -182,7 +182,9 @@
-         // fix title for special columns
-         static $specials = array('%title%'  => array('page', 'title'),
-                                  '%pageid%' => array('title', 'page'),
--                                 '%class%'  => array('class'));
-+                                 '%class%'  => array('class'),
-+                                 '%rpm%'    => array('rpm'),
-+                                );
+You need to create 'rpm' table manually:
+CREATE TABLE rpmdb (eid INTEGER PRIMARY KEY, pid INTEGER, value);
+
+Handling it automatically would mean have to renumber upstream patches each
+time...
+
+#--- dokuwiki-plugin-data-20120227/db/latest.version~	2012-02-27 16:32:51.000000000 +0200
+#+++ dokuwiki-plugin-data-20120227/db/latest.version	2012-03-13 13:10:57.241251292 +0200
+#@@ -1 +1 @@
+#-5
+#+6
+--- dokuwiki-plugin-data-20120227/helper.php~	2012-03-13 13:10:04.000000000 +0200
++++ dokuwiki-plugin-data-20120227/helper.php	2012-03-13 13:11:33.742793083 +0200
+@@ -184,6 +184,7 @@
+         static $specials = array('%title%'   => array('page', 'title'),
+                                  '%pageid%'  => array('title', 'page'),
+                                  '%class%'   => array('class'),
++                                 '%rpm%'     => array('rpm'),
+                                  '%lastmod%' => array('lastmod','timestamp'));
          if (isset($specials[$column['title']])) {
              $s = $specials[$column['title']];
-             $column['title'] = $this->getLang($s[0]);
---- dokuwiki-plugin-data-20100608/lang/en/lang.php	2010-11-03 15:20:30.000000000 +0200
-+++ dokuwiki-plugin-data-20100608/lang/en/lang.php	2010-12-01 19:50:59.217678000 +0200
+--- dokuwiki-plugin-data-20120227/lang/en/lang.php~	2012-02-27 16:32:51.000000000 +0200
++++ dokuwiki-plugin-data-20120227/lang/en/lang.php	2012-03-13 13:12:04.190745746 +0200
 @@ -16,6 +16,7 @@
  $lang['page']      = 'Page';
  $lang['title']     = 'Page Name';
  $lang['class']     = 'Page Class';
 +$lang['rpm']       = 'RPM Package';
+ $lang['lastmod']   = 'Last Modified';
  
  $lang['name']      = 'Type Alias';
- $lang['type']      = 'Original Type';
 --- dokuwiki-plugin-data-20100608/syntax/table.php	2010-11-03 15:20:30.000000000 +0200
 +++ dokuwiki-plugin-data-20100608/syntax/table.php	2010-12-01 19:50:59.217678000 +0200
 @@ -328,6 +328,13 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-data/separate-rpmdb.patch?r1=1.1&r2=1.2&f=u