packages: dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec - conflicts wi...

[glen]

Author: glen                         Date: Sat Feb 11 12:31:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflicts with html2pdf due handling same do=export_pdf action

---- Files affected:
packages/dokuwiki-plugin-dw2pdf:
   dokuwiki-plugin-dw2pdf.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec
diff -u packages/dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec:1.1 packages/dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec:1.2
--- packages/dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec:1.1	Sat Feb 11 12:45:00 2012
+++ packages/dokuwiki-plugin-dw2pdf/dokuwiki-plugin-dw2pdf.spec	Sat Feb 11 13:30:59 2012
@@ -17,6 +17,7 @@
 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)
 
@@ -78,5 +79,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/02/11 12:30:59  glen
+- conflicts with html2pdf due handling same do=export_pdf action
+
 Revision 1.1  2012/02/11 11:45:00  glen
 - new
================================================================

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