fix inclusion of system markdown class

diff --git a/dokuwiki-plugin-markdownextra.spec b/dokuwiki-plugin-markdownextra.spec
index be49381ea451929830c0bec106fd0cd1f96d5b7c..7d0afc2102a1147ae9b3a958e57e9197d9d6c104 100644 (file)
--- a/dokuwiki-plugin-markdownextra.spec
+++ b/dokuwiki-plugin-markdownextra.spec
@@ -4,11 +4,12 @@
 Summary:       DokuWiki Markdown Extra plugin
 Name:          dokuwiki-plugin-%{plugin}
 Version:       20101106
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://madpropellerhead.com/projects/markdownextra.tgz
 # Source0-md5: 3e703cbfe84108e252c354009a304cd2
+Patch0:                sys-path.patch
 URL:           http://www.dokuwiki.org/plugin:markdownextra
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.553
@@ -24,6 +25,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                plugindir       %{dokudir}/lib/plugins/%{plugin}
 %define                find_lang       %{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
 
+%define                _noautopear     pear
+%define                _noautoreq      %{?_noautophp} %{?_noautopear}
+
 %description
 Parses PHP Markdown Extra blocks.
 
@@ -31,6 +35,7 @@ Parses PHP Markdown Extra blocks.
 %setup -qc
 mv %{plugin}/* .
 %undos -f txt,php
+%patch0 -p1
 
 version=$(awk '/^date/{print $2}' plugin.info.txt)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then

diff --git a/sys-path.patch b/sys-path.patch
new file mode 100644 (file)
index 0000000..7aa2396
--- /dev/null
+++ b/sys-path.patch
@@ -0,0 +1,11 @@
+--- markdownextra/syntax.php~  2012-10-30 18:01:59.000000000 +0200
++++ markdownextra/syntax.php   2012-10-30 19:26:10.953329563 +0200
+@@ -11,7 +11,7 @@
+ if (!defined('DOKU_INC')) die();
+ if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
+ require_once (DOKU_PLUGIN . 'syntax.php');
+-require_once (DOKU_PLUGIN . 'markdownextra/markdown.php');
++require_once 'markdown.php';
+ 
+ class syntax_plugin_markdownextra extends DokuWiki_Syntax_Plugin {
+