- up to 2009-12-25 release

Changed files:
    dokuwiki-config.patch -> 1.11
    dokuwiki.spec -> 1.68

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 3a66ece5b0e138cbb06b8b46d2efcea7a4a82388..d334156bdb1081802268abb9e0ac36a26bad0077 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -18,13 +18,13 @@
  $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-rc2009-12-02/install.php~ 2009-12-07 20:47:01.000000000 +0200
-+++ dokuwiki-rc2009-12-02/install.php  2009-12-07 20:47:41.702560038 +0200
+--- dokuwiki-2009-12-25/install.php~   2010-01-04 18:16:29.000000000 +0200
++++ dokuwiki-2009-12-25/install.php    2010-01-04 18:16:45.552540795 +0200
 @@ -47,6 +47,7 @@
      '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
      '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
-     'rc2009-12-02' => '993c4b2b385643efe5abf8e7010e11f4',
-+    'rc2009-12-02-pld' => 'b9f4419b5b1b9b915c35f4cd3c66bda1',
+     '2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
++    '2009-12-25-pld' => 'b9f4419b5b1b9b915c35f4cd3c66bda1',
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 7a31ad7e7d809670e3a050db3cd3a3282e2fc34e..4c2bbe59a112c93310d8fd77c5e25a0d42831522 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,16 +1,18 @@
-%define                subver  2009-12-02
-%define                ver     %(echo %{subver} | tr -d -)
+# TODO
+# - external: http://adldap.sourceforge.net/
+%define                subver  2009-12-25
+%define                ver             %(echo %{subver} | tr -d -)
 %define                php_min_version 5.1.2
 %include       /usr/lib/rpm/macros.php
 Summary:       PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.15
+Release:       0.16
 License:       GPL v2
 Group:         Applications/WWW
-Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5: 65e0a7a496e1fd49fb12477211053b55
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: 1428c896de83bd2a754efd18919d0594
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       jude.png
@@ -108,7 +110,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
 %patch2 -p1
 %patch3 -p1