packages: qscintilla2/qscintilla2-internal_build.patch, qscintilla2/qscinti...

[qboosh]

Author: qboosh                       Date: Sun Jun 24 07:10:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.6.2
- updated internal_build patch

---- Files affected:
packages/qscintilla2:
   qscintilla2-internal_build.patch (1.1 -> 1.2) , qscintilla2.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/qscintilla2/qscintilla2-internal_build.patch
diff -u packages/qscintilla2/qscintilla2-internal_build.patch:1.1 packages/qscintilla2/qscintilla2-internal_build.patch:1.2
--- packages/qscintilla2/qscintilla2-internal_build.patch:1.1	Tue Dec 26 04:50:34 2006
+++ packages/qscintilla2/qscintilla2-internal_build.patch	Sun Jun 24 09:10:18 2012
@@ -4,8 +4,8 @@
  
  TEMPLATE = lib
  TARGET = qscintillaplugin
-+INCLUDEPATH = ../Qt4
-+LIBPATH = ../Qt4
++INCLUDEPATH = ../Qt4Qt5
++LIBPATH = ../Qt4Qt5
  
  CONFIG += designer release plugin
  

================================================================
Index: packages/qscintilla2/qscintilla2.spec
diff -u packages/qscintilla2/qscintilla2.spec:1.39 packages/qscintilla2/qscintilla2.spec:1.40
--- packages/qscintilla2/qscintilla2.spec:1.39	Sat Feb 18 15:02:04 2012
+++ packages/qscintilla2/qscintilla2.spec	Sun Jun 24 09:10:18 2012
@@ -6,12 +6,12 @@
 Summary:	QScintilla2 - a port to Qt of the Scintilla editing component
 Summary(pl.UTF-8):	QScintilla2 - port komponentu edytora Scintilla dla biblioteki Qt
 Name:		qscintilla2
-Version:	2.6.1
+Version:	2.6.2
 Release:	1
 License:	GPL v2 or GPL v3 with Riverbank GPL Exception v1.1
 Group:		X11/Libraries
 Source0:	http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
-# Source0-md5:	39a1d0567a20b416177eb1a8afe225a7
+# Source0-md5:	6e6641b6f3863c01cc28c2d7bd2495f9
 Patch0:		%{name}-internal_build.patch
 URL:		http://www.riverbankcomputing.co.uk/software/qscintilla/
 BuildRequires:	QtDesigner-devel
@@ -96,7 +96,7 @@
 %patch0 -p1
 
 %build
-cd Qt4
+cd Qt4Qt5
 qmake-qt4 qscintilla.pro
 %{__make}
 cd -
@@ -109,15 +109,15 @@
 cd Python
 %{__python} configure.py \
 	-c -j 3 \
-	-n ../Qt4 \
-	-o ../Qt4
+	-n ../Qt4Qt5 \
+	-o ../Qt4Qt5
 %{__make}
 cd -
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C Qt4 install \
+%{__make} -C Qt4Qt5 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 %{__make} -C designer-Qt4 install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -179,6 +179,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2012/06/24 07:10:18  qboosh
+- updated to 2.6.2
+- updated internal_build patch
+
 Revision 1.39  2012/02/18 14:02:04  qboosh
 - updated to 2.6.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/qscintilla2/qscintilla2-internal_build.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/qscintilla2/qscintilla2.spec?r1=1.39&r2=1.40