- up to 2012-01-25 Angua release

Changed files:
    dokuwiki-config.patch -> 1.18
    dokuwiki-paths.patch -> 1.6
    dokuwiki.spec -> 1.103

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 7a09090ff14ded7b59d06cac18a7f62c60c15e6c..1fc87d6b23f93984005ee7e5975d816d2c46e478 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,15 +1,14 @@
-diff -dur -x '*.orig' dokuwiki-2011-05-25.orig/conf/dokuwiki.php dokuwiki-2011-05-25/conf/dokuwiki.php
---- dokuwiki-2011-05-25.orig/conf/dokuwiki.php 2011-06-08 10:34:21.000000000 +0200
-+++ dokuwiki-2011-05-25/conf/dokuwiki.php      2011-06-08 10:34:49.000000000 +0200
-@@ -18,7 +18,7 @@
- $conf['lang']        = 'en';              //your language
+--- dokuwiki-2012-01-25/conf/dokuwiki.php~     2012-01-27 09:33:02.000000000 +0200
++++ dokuwiki-2012-01-25/conf/dokuwiki.php      2012-01-27 09:33:34.363230629 +0200
+@@ -19,7 +19,7 @@
  $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
  $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
+ $conf['cookiedir']   = '';                //Cookie path. Leave blank for using baseurl.
 -$conf['savedir']     = './data';          //where to store all the files
-+$conf['savedir']     = '/var/lib/dokuwiki';          //where to store all the files
++$conf['savedir']     = '/var/lib/dokuwiki';  //where to store all the files
  $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
+ $conf['mediarevisions'] = 1;              //enable/disable media revisions
  
- /* Display Options */
 @@ -26,7 +26,7 @@
  $conf['start']       = 'start';           //name of start page
  $conf['title']       = 'PLD Linux DokuWiki'; //what to show in the title
@@ -19,14 +18,14 @@ diff -dur -x '*.orig' dokuwiki-2011-05-25.orig/conf/dokuwiki.php dokuwiki-2011-0
  $conf['fullpath']    = 0;                 //show full path of the document or relative to datadir only? 0|1
  $conf['recent']      = 20;                //how many entries to show in recent
  $conf['breadcrumbs'] = 10;                //how many recent visited pages to show
---- dokuwiki-rc2011-11-10/install.php~ 2011-11-21 12:43:24.000000000 +0200
-+++ dokuwiki-rc2011-11-10/install.php  2011-11-21 12:43:49.050477388 +0200
-@@ -49,7 +49,7 @@
-     '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
+--- dokuwiki-2012-01-25/install.php~   2012-01-27 09:34:09.000000000 +0200
++++ dokuwiki-2012-01-25/install.php    2012-01-27 09:34:34.872417423 +0200
+@@ -50,7 +50,7 @@
      '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
      '2011-05-25'   => '4241865472edb6fa14a1227721008072',
--    '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
-+    '2011-11-10pld'   => '551f1a079e8e83981789b951bd9db29c',
+     '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
+-    '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
++    '2012-01-25pld' => '9e3d022699048b720ff54b6bdf49118f',
  );
  
  

diff --git a/dokuwiki-paths.patch b/dokuwiki-paths.patch
index 6da4553d153fbd7633dd67347a3886eafc6e60c4..a6c8a02a5e777a40d5692209d042bb8dab3fc651 100644 (file)
--- a/dokuwiki-paths.patch
+++ b/dokuwiki-paths.patch
@@ -12,8 +12,8 @@
  
  // check for error reporting override or set error reporting to sane values
  if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
---- dokuwiki-2009-02-14-paths/install.php      2009-02-14 14:13:25.000000000 +0200
-+++ dokuwiki-2009-02-14/install.php    2009-06-15 19:18:30.845283082 +0300
+--- dokuwiki-2012-01-25/install.php~   2012-01-27 09:30:05.000000000 +0200
++++ dokuwiki-2012-01-25/install.php    2012-01-27 09:31:55.795792191 +0200
 @@ -6,8 +6,9 @@
   */
  
@@ -26,28 +26,32 @@
  
  // check for error reporting override or set error reporting to sane values
  if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
-@@ -392,15 +393,15 @@
+@@ -422,17 +422,17 @@
  
      $dirs = array(
-         'conf'      => DOKU_LOCAL,
--        'data'      => DOKU_INC.'data',
--        'pages'     => DOKU_INC.'data/pages',
--        'attic'     => DOKU_INC.'data/attic',
--        'media'     => DOKU_INC.'data/media',
--        'meta'      => DOKU_INC.'data/meta',
--        'cache'     => DOKU_INC.'data/cache',
--        'locks'     => DOKU_INC.'data/locks',
--        'index'     => DOKU_INC.'data/index',
--        'tmp'       => DOKU_INC.'data/tmp'
-+        'data'      => DOKU_DATA,
-+        'pages'     => DOKU_DATA.'pages',
-+        'attic'     => DOKU_DATA.'attic',
-+        'media'     => DOKU_DATA.'media',
-+        'meta'      => DOKU_DATA.'meta',
-+        'cache'     => DOKU_DATA.'cache',
-+        'locks'     => DOKU_DATA.'locks',
-+        'index'     => DOKU_DATA.'index',
-+        'tmp'       => DOKU_DATA.'tmp'
+         'conf'        => DOKU_LOCAL,
+-        'data'        => DOKU_INC.'data',
+-        'pages'       => DOKU_INC.'data/pages',
+-        'attic'       => DOKU_INC.'data/attic',
+-        'media'       => DOKU_INC.'data/media',
+-        'media_attic' => DOKU_INC.'data/media_attic',
+-        'media_meta'  => DOKU_INC.'data/media_meta',
+-        'meta'        => DOKU_INC.'data/meta',
+-        'cache'       => DOKU_INC.'data/cache',
+-        'locks'       => DOKU_INC.'data/locks',
+-        'index'       => DOKU_INC.'data/index',
+-        'tmp'         => DOKU_INC.'data/tmp'
++        'data'        => DOKU_DATA,
++        'pages'       => DOKU_DATA.'pages',
++        'attic'       => DOKU_DATA.'attic',
++        'media'       => DOKU_DATA.'media',
++        'media_attic' => DOKU_DATA.'media_attic',
++        'media_meta'  => DOKU_DATA.'media_meta',
++        'meta'        => DOKU_DATA.'meta',
++        'cache'       => DOKU_DATA.'cache',
++        'locks'       => DOKU_DATA.'locks',
++        'index'       => DOKU_DATA.'index',
++        'tmp'         => DOKU_DATA.'tmp'
      );
  
      $ok = true;

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 21cb639745c93cb2029f5a15d873a19ab6d4c0ab..6c151b5db7db3ba07e31c66f5b4fc23a140775d1 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,6 +1,6 @@
-%define                subver  2011-11-10
+%define                subver  2012-01-25
 %define                ver             %(echo %{subver} | tr -d -)
-%define                php_min_version 5.1.2
+%define                php_min_version 5.2.4
 %include       /usr/lib/rpm/macros.php
 Summary:       PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
@@ -10,9 +10,9 @@ Release:      1
 License:       GPL v2
 Group:         Applications/WWW
 #Source0:      https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
-#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5: 6faf2f586cadbfc23d3b53745a00a482
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: da7ec30fc51c48035adc48dc0535a317
+#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -118,7 +118,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}-rc%{subver}
+%setup -q -n %{name}-%{subver}
 %patch0 -p1
 %patch3 -p1
 %patch4 -p1