- up to 20120227; adds %lastmod% filter

Changed files:
    dokuwiki-plugin-data.spec -> 1.25
    separate-rpmdb.patch -> 1.2

diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index 5aa6f75eafb0bc00a5101ce004a4513bbe70fb33..06a7cafc7f0fce56b3e004a2ef66a63d8744ec07 100644 (file)
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -3,18 +3,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

diff --git a/separate-rpmdb.patch b/separate-rpmdb.patch
index 28c66d4599a2b80268d6523baa2f7becd66b2d23..893c03b9f4daba39c54d5e88902a27c4177ead25 100644 (file)
--- a/separate-rpmdb.patch
+++ b/separate-rpmdb.patch
@@ -4,34 +4,37 @@ As the rpmdb data is huge comparing to other data, it's best we keep it
 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 @@