From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 11 Feb 2012 12:30:59 +0000 (+0000)
Subject: - conflicts with html2pdf due handling same do=export_pdf action
X-Git-Tag: auto/th/dokuwiki-plugin-dw2pdf-20120123-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdokuwiki-plugin-dw2pdf.git;a=commitdiff_plain;h=759a0ca5ae75b7ac673b723ed0751e670a838e82;hp=e6346a711ee1e6ae8a2d1fe986d4a5ce9763d7e6

- conflicts with html2pdf due handling same do=export_pdf action

Changed files:
    dokuwiki-plugin-dw2pdf.spec -> 1.2
---

diff --git a/dokuwiki-plugin-dw2pdf.spec b/dokuwiki-plugin-dw2pdf.spec
index 889b416..3897f4a 100644
--- a/dokuwiki-plugin-dw2pdf.spec
+++ b/dokuwiki-plugin-dw2pdf.spec
@@ -16,6 +16,7 @@ BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.520
 Requires:	dokuwiki >= 20101107
 Requires:	php-common >= 4:%{php_min_version}
+Conflicts:	dokuwiki-plugin-html2pdf
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)