- up to 2010-11-07 release

Changed files:
    dokuwiki-config.patch -> 1.14
    dokuwiki-mailthreads.patch -> 1.3
    dokuwiki-media-userinfo.patch -> 1.3
    dokuwiki.spec -> 1.88

diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index a1baafb8a8780a1dd3733425de52b420436df94d..3de452c94386ec6b0fa07462adb98997a8e19b3c 100644 (file)
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -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'
  );
  
  

diff --git a/dokuwiki-mailthreads.patch b/dokuwiki-mailthreads.patch
index f0cf607a7d4ac63cd11934f4cb2a1d592adfee7d..0a6308302b8212f9384cd5db7e07c49ae2f30db3 100644 (file)
--- a/dokuwiki-mailthreads.patch
+++ b/dokuwiki-mailthreads.patch
@@ -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);
  }
  
  /**

diff --git a/dokuwiki-media-userinfo.patch b/dokuwiki-media-userinfo.patch
deleted file mode 100644 (file)
index 59391ca..0000000
--- a/dokuwiki-media-userinfo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-CHECKME: possibly outdated now?
-
---- dokuwiki-rc2010-10-07/inc/media.php~       2010-10-07 21:28:44.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/media.php        2010-10-07 21:30:12.262536013 +0300
-@@ -392,6 +392,7 @@
-     global $lang;
-     global $conf;
-     global $INFO;
-+    global $USERINFO;
-     if(empty($conf['notify'])) return; //notify enabled?
- 
-     $ip = clientIP();
-@@ -316,8 +317,8 @@
- 
-     $from = $conf['mailfrom'];
-     $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from);
--    $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
--    $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
-+    $from = str_replace('@NAME@',$USERINFO['name'],$from);
-+    $from = str_replace('@MAIL@',$USERINFO['mail'],$from);
- 
-     $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
- 

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 42c2194cdf6060c2356ed5a372752694c77726df..cd42b612ae96ee2f6667545bd5e7e2eb4d534cee 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,4 +1,4 @@
-%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
@@ -6,11 +6,11 @@ Summary:      PHP-based Wiki webapplication
 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
@@ -36,7 +36,6 @@ Patch5:               %{name}-http_auth-option.patch
 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
@@ -117,7 +116,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
@@ -126,7 +125,6 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1