- Version: 2011-05-25 ('Rincewind' stable)

Changed files:
    dokuwiki-config.patch -> 1.16
    dokuwiki.spec -> 1.94

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index e9735f302e6c922036b51e9bf97b6d040a0bb3db..1817a08e63f3878e2e49368b964c21d2d5f2c827 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -1,5 +1,6 @@
---- dokuwiki-rc2009-02-06.new/conf/dokuwiki.php        2009-02-07 10:53:46.339771628 +0100
-+++ dokuwiki-0.0.20090214/conf/dokuwiki.php    2009-02-14 19:18:54.000000000 +0100
+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
  $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
@@ -11,21 +12,22 @@
  /* Display Options */
 @@ -26,7 +26,7 @@
  $conf['start']       = 'start';           //name of start page
- $conf['title']       = 'DokuWiki';        //what to show in the title
+ $conf['title']       = 'PLD Linux DokuWiki'; //what to show in the title
  $conf['template']    = 'default';         //see lib/tpl directory
 -$conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
 +$conf['license']     = 'publicdomain';    //see conf/license.php
  $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-04-22/install.php~ 2011-04-27 00:21:28.000000000 +0300
-+++ dokuwiki-rc2011-04-22/install.php  2011-04-27 00:22:10.117915194 +0300
+diff -dur -x '*.orig' dokuwiki-2011-05-25.orig/install.php dokuwiki-2011-05-25/install.php
+--- dokuwiki-2011-05-25.orig/install.php       2011-06-08 10:34:21.000000000 +0200
++++ dokuwiki-2011-05-25/install.php    2011-06-08 10:36:30.000000000 +0200
 @@ -48,7 +48,7 @@
      '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
      '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
      '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
--    'rc2011-04-22' => '4241865472edb6fa14a1227721008072',
-+    'rc2011-04-22pld' => '9e9496204af31a3fe6b3b97d58d7c58f',
+-    '2011-05-25'   => '4241865472edb6fa14a1227721008072',
++    '2011-05-25pld'   => '9e9496204af31a3fe6b3b97d58d7c58f',
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index e3df36e6f4bcd8d99c7da7425450ee6c0ae33a77..19a314698be8ea70457d3a09a7abc1e874aa4612 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,6 +1,6 @@
 # TODO
 # - remove %config from lang files: https://github.com/splitbrain/dokuwiki/commit/e6cecb0872ef457f44529edbc736aba3dc3ac258
-%define                subver  2011-05-08
+%define                subver  2011-05-25
 %define                ver             %(echo %{subver} | tr -d -)
 %define                php_min_version 5.1.2
 %include       /usr/lib/rpm/macros.php
@@ -8,13 +8,13 @@ Summary:      PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.5
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 #Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
 #Source0:      https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5: 9410077f2a7e885519563a3c9b6f5749
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: ac7f14fec7ed27d30af1b6b92a9ca994
 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