[packages/dokuwiki-plugin-markdownextra] use system php-markdown-extra package

glen glen at pld-linux.org
Tue Oct 30 17:23:00 CET 2012


commit 5ae2a353c19b1cce7e5811a91eb39f80ed7e0593
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Oct 30 18:22:54 2012 +0200

    use system php-markdown-extra package

 dokuwiki-plugin-markdownextra.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/dokuwiki-plugin-markdownextra.spec b/dokuwiki-plugin-markdownextra.spec
index 6687384..20be9c6 100644
--- a/dokuwiki-plugin-markdownextra.spec
+++ b/dokuwiki-plugin-markdownextra.spec
@@ -14,6 +14,7 @@ BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	dokuwiki >= 20091225
 Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-markdown-extra >= 1.2.4
 Requires:	php-pcre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,9 +24,6 @@ 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.
 
@@ -46,6 +44,9 @@ install -d $RPM_BUILD_ROOT%{plugindir}
 cp -a . $RPM_BUILD_ROOT%{plugindir}
 %{__rm} $RPM_BUILD_ROOT%{plugindir}/License.text
 
+# php-markdown-extra
+%{__rm} $RPM_BUILD_ROOT%{plugindir}/markdown.php
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-markdownextra.git/commitdiff/5ae2a353c19b1cce7e5811a91eb39f80ed7e0593



More information about the pld-cvs-commit mailing list