- up to 2009-12-02 “Mulled Wine” (RC1)

Changed files:
    dokuwiki-config.patch -> 1.10
    dokuwiki.spec -> 1.63

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 8e34d1c79c0446818c494bfeec71307d3c63f96f..3a66ece5b0e138cbb06b8b46d2efcea7a4a82388 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/install.php~      2009-11-10 15:24:36.000000000 +0200
-+++ dokuwiki/install.php       2009-11-10 15:25:06.540902430 +0200
-@@ -46,6 +46,7 @@
-     '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
+--- 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
+@@ -47,6 +47,7 @@
      '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
      '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
-+    '2009-02-14-pld'   => '4065e7c96f84335b0e4e89276b4ff747',
+     'rc2009-12-02' => '993c4b2b385643efe5abf8e7010e11f4',
++    'rc2009-12-02-pld' => 'b9f4419b5b1b9b915c35f4cd3c66bda1',
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 6c551a790bb49a5c57cb25298adbecbef32484ef..7c4e5fde694a216f2a7500450c224d2d41790eb0 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%define                subver  2009-11-16
+%define                subver  2009-12-02
 %define                ver     %(echo %{subver} | tr -d -)
 Summary:       PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
@@ -7,9 +7,8 @@ Version:        %{ver}
 Release:       0.9
 License:       GPL v2
 Group:         Applications/WWW
-# Source0Download: http://dev.splitbrain.org/browse/snapshots/
-Source0:       http://dev.splitbrain.org/download/snapshots/%{name}-%{subver}.tgz
-# Source0-md5: 8d6d90362650cbd3ad8979b4e22c43ae
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
+# Source0-md5: 65e0a7a496e1fd49fb12477211053b55
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       jude.png
@@ -95,8 +94,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -qc
-mv %{name}/* .
+%setup -q -n %{name}-rc%{subver}
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -327,6 +325,7 @@ exit 0
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki-128.png
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/dokuwiki.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/syntax.txt
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
 
 %files setup
 %defattr(644,root,root,755)