- use system simplepie package; rel 6

Changed files:
    dokuwiki.spec -> 1.53
    simplepie.patch -> 1.1

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 0b5616188193d78c48eb504164e19447d4016a98..0445cf82f6b538e84bebc98f980bf66ed322889b 100644 (file)
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -4,7 +4,7 @@ Summary:        PHP-based Wiki webapplication
 Summary(pl.UTF-8):     Aplikacja WWW Wiki oparta na PHP
 Name:          dokuwiki
 Version:       %{ver}
-Release:       5
+Release:       6
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -32,9 +32,11 @@ Patch11:     %{name}-notifyns.patch
 Patch12:       %{name}-mailthreads.patch
 Patch13:       %{name}-media-directlink.patch
 Patch14:       interwiki-outputonly.patch
+Patch15:       simplepie.patch
 URL:           http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires: rpmbuild(macros) >= 1.520
 Requires:      geshi >= 1.0.7.19
+Requires:      php-simplepie >= 1.0.1
 Requires:      php(xml)
 Requires:      webapps
 Requires:      webserver(access)
@@ -103,6 +105,7 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html
@@ -115,6 +118,9 @@ mv conf/words.aspell{.dist,}
 rm -f inc/geshi.php
 rm -rf inc/geshi
 
+# use system simplepie package
+rm -f inc/SimplePie.php
+
 # our plugins dir is not writable anyway, nothing to convert
 rm -rf lib/plugins/upgradeplugindirectory
 

diff --git a/simplepie.patch b/simplepie.patch
new file mode 100644 (file)
index 0000000..e94f29a
--- /dev/null
+++ b/simplepie.patch
@@ -0,0 +1,11 @@
+--- dokuwiki/inc/FeedParser.php~       2009-02-14 14:13:24.000000000 +0200
++++ dokuwiki/inc/FeedParser.php        2009-08-03 18:14:02.790174263 +0300
+@@ -7,7 +7,7 @@
+ 
+ if(!defined('DOKU_INC')) die('meh.');
+ require_once(DOKU_INC.'inc/HTTPClient.php');
+-require_once(DOKU_INC.'inc/SimplePie.php');
++require_once 'simplepie.inc';
+ 
+ 
+ /**