Hello community,
here is the log from the commit of package qscintilla
checked in at Mon Aug 6 23:13:03 CEST 2007.
--------
--- KDE/qscintilla/qscintilla.changes 2006-06-05 09:17:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/qscintilla/qscintilla.changes 2007-08-06 18:50:22.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Aug 6 18:49:03 CEST 2007 - dmueller@suse.de
+
+- update to 1.73 (scintilla 2.1) (#297650)
+ * A revised API, incompatible with QScintilla v1.
+ * Hugely improved autocompletion and call tips support.
+ * Supports both Qt v3 and Qt v4.
+ * Includes Python bindings.
+
+-------------------------------------------------------------------
Old:
----
qscintilla-1.65-gpl-1.6.tar.bz2
New:
----
QScintilla-1.73-gpl-2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.gh6001/_old 2007-08-06 23:12:05.000000000 +0200
+++ /var/tmp/diff_new_pack.gh6001/_new 2007-08-06 23:12:05.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package qscintilla (Version 1.65)
+# spec file for package qscintilla (Version 1.73)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,17 +13,17 @@
Name: qscintilla
BuildRequires: libjpeg-devel qt3-devel-tools update-desktop-files
%if %suse_version > 1000
-BuildRequires: libdrm-devel
+BuildRequires: libdrm-devel libqt4-devel
%endif
URL: http://www.riverbankcomputing.co.uk/qscintilla
-License: GPL
+License: GPL v2 or later
Group: Development/Libraries/C and C++
Summary: C++ Editor Class Library
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.65
-Release: 15
-%define scintilla_version 1.6
-Source: %name-%version-gpl-%scintilla_version.tar.bz2
+Version: 1.73
+Release: 1
+%define scintilla_version 2.1
+Source: QScintilla-%version-gpl-%scintilla_version.tar.bz2
Patch: %name.diff
%description
@@ -61,52 +61,64 @@
Riverbank Computing Limited
%prep
-%setup -q -n %name-%version-gpl-%scintilla_version
+%setup -q -n QScintilla-%version-gpl-%scintilla_version
%patch
%build
-rm -rf $RPM_BUILD_ROOT
+pushd Qt4
+qmake
+make %{?jobs:-j %jobs}
+popd
export QTDIR=/usr/lib/qt3/
export QTDIR_LIB=$RPM_BUILD_ROOT/$QTDIR/%_lib
export PATH=$QTDIR/bin/:$PATH
-cd qt
+pushd Qt3
qmake -o Makefile qscintilla.pro
make %{?jobs:-j %jobs}
+popd
%install
-cd qt
-mkdir -p $RPM_BUILD_ROOT/usr/%_lib
-mkdir -p $RPM_BUILD_ROOT/usr/lib/qt3/include
-mkdir -p $RPM_BUILD_ROOT/usr/lib/qt3/translations
-install -m 0644 qextscintilla*.h $RPM_BUILD_ROOT/usr/lib/qt3/include
-install -m 0644 qscintilla*.qm $RPM_BUILD_ROOT/usr/lib/qt3/translations
-ln -sf ../lib/qt3/%_lib/libqscintilla.so.6 $RPM_BUILD_ROOT/usr/%_lib
+pushd Qt4
+make INSTALL_ROOT=$RPM_BUILD_ROOT install
+popd
+pushd Qt3
+make INSTALL_ROOT=$RPM_BUILD_ROOT install_header install_trans
+for f in libqscintilla2.so*; do
+ install -m 755 -D $f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/$f
+done
+popd
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc NEWS README ChangeLog LICENSE
-/usr/%_lib/libqscintilla.so.6
-/usr/lib/qt3/%_lib/libqscintilla.so.6
-/usr/lib/qt3/%_lib/libqscintilla.so.6.0
-/usr/lib/qt3/%_lib/libqscintilla.so.6.0.0
-/usr/lib/qt3/translations/qscintilla_de.qm
-/usr/lib/qt3/translations/qscintilla_fr.qm
-/usr/lib/qt3/translations/qscintilla_ru.qm
-/usr/lib/qt3/translations/qscintilla_ptbr.qm
+/usr/lib/qt3/%_lib/libqscintilla2.so.2
+/usr/lib/qt3/%_lib/libqscintilla2.so.2.0
+/usr/lib/qt3/%_lib/libqscintilla2.so.2.0.0
+/usr/lib/qt3/translations/qscintilla_*.qm
+/usr/share/qt4/qsci
+/usr/share/qt4/translations/qscintilla_*.qm
%files devel
%defattr(-,root,root)
-%doc doc/html
+%doc doc/html-Qt3
+/usr/include/Qsci
/usr/lib/qt3/include/*
-/usr/lib/qt3/%_lib/libqscintilla.so
+/usr/lib/qt3/%_lib/libqscintilla2.so
-%changelog -n qscintilla
+%changelog
+* Mon Aug 06 2007 - dmueller@suse.de
+- update to 1.73 (scintilla 2.1) (#297650)
+ * A revised API, incompatible with QScintilla v1.
+ * Hugely improved autocompletion and call tips support.
+ * Supports both Qt v3 and Qt v4.
+ * Includes Python bindings.
* Mon Jun 05 2006 - stbinner@suse.de
- fix build for < 10.1
* Thu May 18 2006 - dmueller@suse.de
++++++ qscintilla.diff ++++++
--- /var/tmp/diff_new_pack.gh6001/_old 2007-08-06 23:12:05.000000000 +0200
+++ /var/tmp/diff_new_pack.gh6001/_new 2007-08-06 23:12:05.000000000 +0200
@@ -1,11 +1,11 @@
---- qt/qscintilla.pro
-+++ qt/qscintilla.pro 2003/01/30 23:13:06
-@@ -25,7 +25,7 @@
+--- Qt3/qscintilla.pro
++++ Qt3/qscintilla.pro
+@@ -31,7 +31,7 @@ DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER
+ # Handle both Qt v4 and v3.
+ DESTDIR = $$[QT_INSTALL_LIBS]
+ isEmpty(DESTDIR) {
+- DESTDIR = $(QTDIR)/lib
++ DESTDIR = $(QTDIR_LIB)
+ }
- TEMPLATE = lib
- TARGET = qscintilla
--DESTDIR = $(QTDIR)/lib
-+DESTDIR = $(QTDIR_LIB)
- CONFIG += qt warn_off release dll thread
- INCLUDEPATH = . ../include ../src
- DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER
+ header.path = $$[QT_INSTALL_HEADERS]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org