packages: dokuwiki/dokuwiki-config.patch, dokuwiki/dokuwiki-mailthreads.pat...

[glen]

Author: glen                         Date: Sun Nov  7 21:11:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2010-11-07 release

---- Files affected:
packages/dokuwiki:
   dokuwiki-config.patch (1.13 -> 1.14) , dokuwiki-mailthreads.patch (1.2 -> 1.3) , dokuwiki.spec (1.87 -> 1.88) , dokuwiki-media-userinfo.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki-config.patch
diff -u packages/dokuwiki/dokuwiki-config.patch:1.13 packages/dokuwiki/dokuwiki-config.patch:1.14
--- packages/dokuwiki/dokuwiki-config.patch:1.13	Thu Oct 28 13:21:03 2010
+++ packages/dokuwiki/dokuwiki-config.patch	Sun Nov  7 22:11:17 2010
@@ -18,14 +18,14 @@
  $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-rc2010-10-27/install.php~	2010-10-28 14:13:32.000000000 +0300
-+++ dokuwiki-rc2010-10-27/install.php	2010-10-28 14:14:01.379367387 +0300
+--- dokuwiki-2010-11-07/install.php~	2010-11-07 22:42:18.000000000 +0200
++++ dokuwiki-2010-11-07/install.php	2010-11-07 22:42:40.066936206 +0200
 @@ -47,7 +47,7 @@
      '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
      '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
      '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
--    '2010-10-27rc' => '7921d48195f4db21b8ead6d9bea801b8'
-+    '2010-10-27pld' => 'e5d9d0fc37a774e37587e84e91dc84bc'
+-    '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8'
++    '2010-11-07'   => 'e5d9d0fc37a774e37587e84e91dc84bc'
  );
  
  

================================================================
Index: packages/dokuwiki/dokuwiki-mailthreads.patch
diff -u packages/dokuwiki/dokuwiki-mailthreads.patch:1.2 packages/dokuwiki/dokuwiki-mailthreads.patch:1.3
--- packages/dokuwiki/dokuwiki-mailthreads.patch:1.2	Thu Oct  7 21:29:29 2010
+++ packages/dokuwiki/dokuwiki-mailthreads.patch	Sun Nov  7 22:11:17 2010
@@ -1,10 +1,10 @@
---- dokuwiki-rc2010-10-07/inc/common.php~	2010-10-07 21:34:10.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/common.php	2010-10-07 21:36:02.099167786 +0300
-@@ -1168,7 +1168,20 @@
-     $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
-     $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
+--- dokuwiki-2010-11-07/inc/common.php~	2010-11-07 22:38:45.000000000 +0200
++++ dokuwiki-2010-11-07/inc/common.php	2010-11-07 22:41:54.567137751 +0200
+@@ -1163,7 +1163,20 @@
+         $subject = '['.utf8_substr($conf['title'], 0, 20).'...] '.$subject;
+     }
  
--    mail_send($to,$subject,$text,$from,'',$bcc);
+-    mail_send($to,$subject,$text,$conf['mailfrom'],'',$bcc);
 +    $headers = array();
 +    // add mail headers to identify page changes in same mail thread
 +    $file = wikiFN($id);
@@ -18,7 +18,7 @@
 +        $h .= sprintf("%s: %s%s", $k, $v, MAILHEADER_EOL);
 +    }
 +
-+    mail_send($to,$subject,$text,$from,'' ,$bcc, $h);
++    mail_send($to,$subject,$text,$conf['mailfrom'],'',$bcc,$h);
  }
  
  /**

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.87 packages/dokuwiki/dokuwiki.spec:1.88
--- packages/dokuwiki/dokuwiki.spec:1.87	Fri Nov  5 18:16:58 2010
+++ packages/dokuwiki/dokuwiki.spec	Sun Nov  7 22:11:17 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		subver	2010-10-27
+%define		subver	2010-11-07
 %define		ver		%(echo %{subver} | tr -d -)
 %define		php_min_version 5.1.2
 %include	/usr/lib/rpm/macros.php
@@ -7,11 +7,11 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.2
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5:	9c87390cb4acda65d7b6002b8f7cceeb
+Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5:	b590c45049605e86bc2474a1d04fb4ba
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -37,7 +37,6 @@
 Patch6:		%{name}-nice_exit.patch
 Patch7:		%{name}-mail-headerencodequotes.patch
 Patch8:		%{name}-notify-respect-minor.patch
-Patch9:		%{name}-media-userinfo.patch
 Patch10:	%{name}-mailtext.patch
 Patch11:	%{name}-notifyns.patch
 Patch12:	%{name}-mailthreads.patch
@@ -118,7 +117,7 @@
 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
@@ -127,7 +126,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -381,6 +379,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2010/11/07 21:11:17  glen
+- up to 2010-11-07 release
+
 Revision 1.87  2010/11/05 17:16:58  glen
 - add icon for astah (*.asta) files
 - hardlink identical icons
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki-config.patch?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki-mailthreads.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.87&r2=1.88&f=u