packages: dokuwiki/dokuwiki.spec, dokuwiki/simplepie.patch (NEW) - use syst...

[glen]

Author: glen                         Date: Mon Aug  3 15:15:40 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system simplepie package; rel 6

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.52 -> 1.53) , simplepie.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.52 packages/dokuwiki/dokuwiki.spec:1.53
--- packages/dokuwiki/dokuwiki.spec:1.52	Tue Jul 28 15:55:05 2009
+++ packages/dokuwiki/dokuwiki.spec	Mon Aug  3 17:15:35 2009
@@ -5,7 +5,7 @@
 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
@@ -33,9 +33,11 @@
 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)
@@ -104,6 +106,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 find -name _dummy | xargs rm
 rm -f lib/index.html lib/plugins/index.html
@@ -116,6 +119,9 @@
 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
 
@@ -312,6 +318,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2009/08/03 15:15:35  glen
+- use system simplepie package; rel 6
+
 Revision 1.52  2009/07/28 13:55:05  glen
 - add interwiki-outputonly.patch; rel 5
 

================================================================
Index: packages/dokuwiki/simplepie.patch
diff -u /dev/null packages/dokuwiki/simplepie.patch:1.1
--- /dev/null	Mon Aug  3 17:15:41 2009
+++ packages/dokuwiki/simplepie.patch	Mon Aug  3 17:15:35 2009
@@ -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';
+ 
+ 
+ /**
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.52&r2=1.53&f=u