rpms/qscintilla/devel QScintilla-2-gpl-Qt4-incpath.patch, 1.1, 1.2 qscintilla.spec, 1.18, 1.19
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Fri Jul 18 18:41:40 UTC 2008
Author: ausil
Update of /cvs/extras/rpms/qscintilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30960
Modified Files:
QScintilla-2-gpl-Qt4-incpath.patch qscintilla.spec
Log Message:
rebuild against new PyQT4, fix #449423 propperlly
QScintilla-2-gpl-Qt4-incpath.patch:
Index: QScintilla-2-gpl-Qt4-incpath.patch
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/QScintilla-2-gpl-Qt4-incpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QScintilla-2-gpl-Qt4-incpath.patch 28 Jan 2008 21:33:44 -0000 1.1
+++ QScintilla-2-gpl-Qt4-incpath.patch 18 Jul 2008 18:40:48 -0000 1.2
@@ -1,8 +1,8 @@
---- qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro.designer-incpath 2004-09-16 15:09:24.000000000 -0500
-+++ qscintilla-1.61-gpl-1.4/designer-Qt4/designer.pro 2004-09-16 15:08:31.000000000 -0500
-@@ -9,4 +9,6 @@
-
- SOURCES += qscintillaplugin.cpp
+--- QScintilla-gpl-2.2/designer-Qt4/designer.pro.BAD 2008-07-18 13:22:40.000000000 -0500
++++ QScintilla-gpl-2.2/designer-Qt4/designer.pro 2008-07-18 13:23:02.000000000 -0500
+@@ -12,4 +12,6 @@
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
-LIBS += -lqscintilla2
+LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2
Index: qscintilla.spec
===================================================================
RCS file: /cvs/extras/rpms/qscintilla/devel/qscintilla.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qscintilla.spec 18 Jul 2008 18:11:37 -0000 1.18
+++ qscintilla.spec 18 Jul 2008 18:40:48 -0000 1.19
@@ -1,10 +1,8 @@
-%define _default_patch_fuzz 2
-
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: qscintilla
Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A Scintilla port to Qt
# matches up (pretty much) with qt4
@@ -14,6 +12,7 @@
Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#why is this not upstream?
Patch1: QScintilla-2-gpl-Qt4-incpath.patch
BuildRequires: qt4-devel
@@ -151,6 +150,10 @@
%changelog
+* Fri Jul 18 2008 Dennis Gilmore <dennis at ausil.us> - 2.2-3
+- rebuild for newer PyQT4
+- fix #449423 properly
+
* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 2.2-2
- fix build (#449423)
More information about the fedora-extras-commits
mailing list