packages: psi-plus/psi-plus.spec - C: psi

[lisu]

Author: lisu                         Date: Tue Apr 12 20:02:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- C: psi

---- Files affected:
packages/psi-plus:
   psi-plus.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/psi-plus/psi-plus.spec
diff -u packages/psi-plus/psi-plus.spec:1.3 packages/psi-plus/psi-plus.spec:1.4
--- packages/psi-plus/psi-plus.spec:1.3	Tue Apr 12 22:00:16 2011
+++ packages/psi-plus/psi-plus.spec	Tue Apr 12 22:02:50 2011
@@ -53,6 +53,7 @@
 Requires:	qt4-plugin-qca-ossl
 Suggests:	gpgme >= 1.0.0
 Obsoletes:	qt-designer-psiwidgets
+Conflicts:	psi
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -154,6 +155,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/04/12 20:02:50  lisu
+- C: psi
+
 Revision 1.3  2011/04/12 20:00:16  lisu
 - updated to 0.15.3792
 - use %%{name}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/psi-plus/psi-plus.spec?r1=1.3&r2=1.4&f=u