[packages/qscintilla] Revert "- BC on itself"

baggins baggins at pld-linux.org
Sat Jan 25 10:42:14 CET 2014


commit 3a5fde0f9fd2fbd219c4064c22a401222983a10c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 25 10:41:55 2014 +0100

    Revert "- BC on itself"
    
    This reverts commit dc44204a369264df163201c13e3a3af93e6503b8.
    
    Commit made to wrong package

 qscintilla.spec | 5 -----
 1 file changed, 5 deletions(-)
---
diff --git a/qscintilla.spec b/qscintilla.spec
index 21c56af..f68aec2 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,7 +1,3 @@
-#
-# TODO:
-#	- fix building with qscintilla2(-devel) installed, remove BC
-#
 %define	scintilla_ver	1.71
 Summary:	QScintilla - a port of Neil Hodgson's Scintilla C++ editor class to Qt
 Summary(pl.UTF-8):	QScintilla - port do Qt klas C++ edytora Scintilla autorstwa Neila Hodgsona
@@ -16,7 +12,6 @@ Source0:	http://www.riverbankcomputing.com/Downloads/QScintilla1/QScintilla-%{sc
 URL:		http://www.riverbankcomputing.co.uk/qscintilla/index.php
 BuildRequires:	qmake
 BuildRequires:	qt-devel >= 3.0
-BuildConflicts:	qscintilla2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qscintilla.git/commitdiff/3a5fde0f9fd2fbd219c4064c22a401222983a10c



More information about the pld-cvs-commit mailing list