- up to 2011-11-10 rc

Changed files:
    dokuwiki-config.patch -> 1.17
    dokuwiki.spec -> 1.97

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 1817a08e63f3878e2e49368b964c21d2d5f2c827..7a09090ff14ded7b59d06cac18a7f62c60c15e6c 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -19,15 +19,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
-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',
+--- 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',
      '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
--    '2011-05-25'   => '4241865472edb6fa14a1227721008072',
-+    '2011-05-25pld'   => '9e9496204af31a3fe6b3b97d58d7c58f',
+     '2011-05-25'   => '4241865472edb6fa14a1227721008072',
+-    '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
++    '2011-11-10pld'   => '551f1a079e8e83981789b951bd9db29c',
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 8d2b1e6ed513f73e38600c8ff5288a8540579740..b931526b8a8d0e5a8ab85832aee99d66e600b5c9 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-25a
+%define                subver  2011-11-10
 %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:       1
+Release:       0.2
 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}-%{subver}.tgz
-# Source0-md5: 6452eff54afa35e031e15fec9a737dd1
+#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
 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}-%{subver}
+%setup -q -n %{name}-rc%{subver}
 %patch0 -p1
 %patch3 -p1
 %patch4 -p1
@@ -214,16 +214,6 @@ findup -m $RPM_BUILD_ROOT
 # find locales
 %find_lang %{name}.lang
 
-# make inc/lang/en/edit.txt as %config
-%{__sed} -i -e '
-/%%lang([^)]\+) \/usr\/share\/dokuwiki\/inc\/lang\/[^/]\+/{
-       # make entry as %%dir
-       s/^/%%dir /; p
-
-       # add files inside the %dir
-       s/^%%dir /%%config(noreplace) %%verify(not md5 mtime size) /; s/$/\/*.*/
-}' %{name}.lang
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -279,7 +269,6 @@ exit 0
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
 
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediameta.php
-#%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/words.aspell
 %attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scheme.conf
 
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.local.conf
@@ -292,15 +281,17 @@ exit 0
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/userstyle.css
 %attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.php
 
-# use local.php,local.protected.php, etc for local changes
+# use local.php, local.protected.php, etc for local changes
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
-%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/entities.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/interwiki.conf
-%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/smileys.conf
 
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/plugins.required.php
+
 # samples. perhaps move to %doc instead?
 %attr(640,root,http) %{_sysconfdir}/mysql.conf.php.example
 %attr(640,root,http) %{_sysconfdir}/acl.auth.php.dist
@@ -361,12 +352,15 @@ exit 0
 %dir %attr(770,root,http) %{_localstatedir}/index
 %dir %attr(770,root,http) %{_localstatedir}/locks
 %dir %attr(770,root,http) %{_localstatedir}/media
+%dir %attr(770,root,http) %{_localstatedir}/media_attic
+%dir %attr(770,root,http) %{_localstatedir}/media_meta
 %dir %attr(770,root,http) %{_localstatedir}/media/wiki
 %dir %attr(770,root,http) %{_localstatedir}/meta
 %dir %attr(770,root,http) %{_localstatedir}/pages
 %dir %attr(770,root,http) %{_localstatedir}/pages/playground
 %dir %attr(770,root,http) %{_localstatedir}/pages/wiki
 %dir %attr(770,root,http) %{_localstatedir}/tmp
+
 %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