up to 2012-09-10 "Adora Belle" RC1

make default width a bit wider in new default skin

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 0e956349d7a9a1fa0dbf4f0d05ecc112b3a50ce0..d2be31c6e51e90d533b5e50db93d4ae8afecf841 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -12,15 +12,14 @@
  $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
  $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
  $conf['cookiedir']   = '';                //path to use in cookies - blank for basedir
---- dokuwiki-2012-06-24/install.php    2012-06-24 21:56:11.184049230 +0300
-+++ dokuwiki-2012-06-24/install.php    2012-07-07 15:10:52.440544560 +0300
-@@ -54,7 +54,8 @@
+--- dokuwiki-2012-09-10/install.php~   2012-09-10 18:03:15.000000000 +0300
++++ dokuwiki-2012-09-10/install.php    2012-09-10 18:03:48.869223181 +0300
+@@ -56,7 +56,7 @@
      '2011-05-25'   => '4241865472edb6fa14a1227721008072',
      '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
      '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
--    'devel'        => 'eb0b3fc90056fbc12bac6f49f7764df3'
-+    'devel'        => 'eb0b3fc90056fbc12bac6f49f7764df3',
-+    'devel-pld'    => '19465557caebbf3fdd381a658196d5c0',
+-    '2012-09-10'   => 'eb0b3fc90056fbc12bac6f49f7764df3'
++    '2012-09-10'   => '19465557caebbf3fdd381a658196d5c0'
  );
  
  

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 116d44924702673c48baa8136a1ba0805b250218..92bdd10cd5c57aaf1a6b5a468b76d7e058956ca7 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,18 +1,18 @@
-%define                subver  2012-09-08
+%define                subver  2012-09-10
 %define                ver             %(echo %{subver} | tr -d -)
-%define                snap    1
+#define                snap    1
 %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
 Name:          dokuwiki
 Version:       %{ver}
-Release:       0.19
+Release:       0.22
 License:       GPL v2
 Group:         Applications/WWW
-#Source0:      http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0:       http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
-# Source0-md5: 7ad81d1b833c9e0c7356afc2d5af2633
+Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: 603aa49cbf046b7431467e4dcefae17f
+#Source0:      http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-lighttpd.conf
 Source3:       http://glen.alkohol.ee/pld/jude.png
@@ -30,6 +30,7 @@ Source11:     http://glen.alkohol.ee/pld/astah.png
 Patch66:       %{name}-config.patch
 Patch0:                %{name}-paths.patch
 Patch1:                system-jquery.patch
+Patch2:                style-width.patch
 Patch4:                %{name}-geshi.patch
 Patch5:                %{name}-http_auth-option.patch
 Patch6:                %{name}-nice_exit.patch
@@ -64,6 +65,7 @@ Requires:     webserver(php)
 Suggests:      php-adldap >= 3.3.1
 Suggests:      php-gd
 Obsoletes:     dokuwiki-plugin-jquery
+Conflicts:     dokuwiki-plugin-icalevents < 20120909
 # can use gz compression to store attic pages
 Suggests:      php-zlib
 BuildArch:     noarch
@@ -128,6 +130,7 @@ touch data/pages/playground/playground.txt
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -340,7 +343,7 @@ exit 0
 %dir %{_appdir}/lib
 # allow plugins dir permission change to allow installation of plugins from admin
 # however does not work with rpm 4.5
-%dir %config %verify(not mode group) %{_appdir}/lib/plugins
+%dir %config %verify(not group mode) %{_appdir}/lib/plugins
 %dir %{_appdir}/lib/plugins/acl
 %{_appdir}/lib/plugins/acl/*.*
 %{_appdir}/lib/plugins/acl/pix

diff --git a/style-width.patch b/style-width.patch
new file mode 100644 (file)
index 0000000..80bd123
--- /dev/null
+++ b/style-width.patch
@@ -0,0 +1,10 @@
+--- dokuwiki/lib/tpl/dokuwiki/style.ini~       2012-08-29 18:37:22.000000000 +0300
++++ dokuwiki/lib/tpl/dokuwiki/style.ini        2012-09-10 17:58:56.000000000 +0300
+@@ -68,5 +68,5 @@
+ __highlight__       = "#ff9"
+ 
+ ; site and sidebar widths
+-__site_width__      = "75em"
+-__sidebar_width__   = "16em"
++__site_width__      = "90em"
++__sidebar_width__   = "13em"