[packages/qscintilla2] - added BC on self

baggins baggins at pld-linux.org
Sat Jan 25 10:46:07 CET 2014


commit a9a3cc914a9da22840a45b6fa3a5205b373ab52b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 25 10:45:59 2014 +0100

    - added BC on self

 qscintilla2.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/qscintilla2.spec b/qscintilla2.spec
index e8e2670..ff8f75a 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -1,5 +1,6 @@
 #
 # TODO:
+# - fix building with qscintilla2(-devel) installed, remove BC
 # - QScintilla2 for Qt3 (does it make any sense nowadays?)
 # - QScintilla2 for Qt5
 #
@@ -23,6 +24,7 @@ BuildRequires:	qt4-build >= 4.8
 BuildRequires:	qt4-qmake >= 4.8
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.558
+BuildConflicts:	qscintilla2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sipfilesdir	%{_datadir}/sip
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qscintilla2.git/commitdiff/a9a3cc914a9da22840a45b6fa3a5205b373ab52b



More information about the pld-cvs-commit mailing list