Hello community, here is the log from the commit of package qt4-qtscript for openSUSE:Factory checked in at Thu Oct 13 00:01:09 CEST 2011.
-------- --- openSUSE:Factory/qt4-qtscript/qt4-qtscript.changes 2011-09-23 12:43:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt4-qtscript/qt4-qtscript.changes 2011-10-12 14:31:17.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Oct 12 12:31:16 UTC 2011 - [email protected] + +- license update: GPL-2 + qt4-qtscript is GPL-2 only + +------------------------------------------------------------------- +Tue Sep 27 07:38:59 UTC 2011 - [email protected] + +- Add qtscript-separate-webkit.patch to fix compilation with + new QtWebKit 2.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- qtscript-separate-webkit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt4-qtscript.spec ++++++ --- /var/tmp/diff_new_pack.X9j8iM/_old 2011-10-13 00:00:57.000000000 +0200 +++ /var/tmp/diff_new_pack.X9j8iM/_new 2011-10-13 00:00:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package qt4-qtscript (Version 0.1.0) +# spec file for package qt4-qtscript # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: qt4-qtscript -BuildRequires: libQtWebKit-devel -Url: http://code.google.com/p/qtscriptgenerator/ -License: GPL v2 or later -Group: Development/Libraries/KDE -Summary: Qt bindings generator for Qt Script Version: 0.1.0 Release: 3 -Source0: qtscript-qt-%version.tar.bz2 +License: GPL-2 +Summary: Qt bindings generator for Qt Script +Url: http://code.google.com/p/qtscriptgenerator/ +Group: Development/Libraries/KDE +Source0: qtscript-qt-%{version}.tar.bz2 Patch0: qtscript-qt-no_phonon.diff Patch1: gcc-44.diff +Patch2: qtscript-separate-webkit.patch +BuildRequires: libQtWebKit-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_eq libqt4 @@ -37,12 +37,10 @@ With the generated bindings you get access to substantial portions of the Qt API from within Qt Script. - - %package doc -Group: Development/Libraries/KDE -License: GPL v2 or later +License: GPL-2 Summary: Qt bindings generator for Qt Script +Group: Development/Libraries/KDE Requires: %{name} = %{version} %description doc @@ -50,38 +48,37 @@ With the generated bindings you get access to substantial portions of the Qt API from within Qt Script. - - %prep -%setup -q -n qtscript-qt-%version +%setup -q -n qtscript-qt-%{version} %patch0 %patch1 +%patch2 %build export QTDIR=/usr cd generator qmake -make %{?jobs:-j %jobs} +make %{?_smp_mflags} ./generator cd ../qtbindings qmake -make %{?jobs:-j %jobs} +make %{?_smp_mflags} cd .. %install # copying generated library files # install doesn't do symlinks -%{__mkdir_p} %{buildroot}%{_libdir}/qt4/plugins/script/ -%{__cp} -a plugins/script/libqtscript* %{buildroot}%{_libdir}/qt4/plugins/script/ -%{__mkdir_p} %{buildroot}%{_defaultdocdir}/%{name} +mkdir -p %{buildroot}%{_libdir}/qt4/plugins/script/ +cp -a plugins/script/libqtscript* %{buildroot}%{_libdir}/qt4/plugins/script/ +mkdir -p %{buildroot}%{_defaultdocdir}/%{name} install -c -m 644 README %{buildroot}%{_defaultdocdir}/%{name}/README install -c -m 644 LICENSE.GPL %{buildroot}%{_defaultdocdir}/%{name}/LICENSE.GPL # Copy generated docs in doc/ to doc directory -%{__mkdir_p} %{buildroot}%{_defaultdocdir}/%{name}/doc-html -%{__cp} -a doc/* %{buildroot}%{_defaultdocdir}/%{name}/doc-html/ +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/doc-html +cp -a doc/* %{buildroot}%{_defaultdocdir}/%{name}/doc-html/ %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root,-) ++++++ qtscript-separate-webkit.patch ++++++ --- generator/qtscript_masterinclude.h 2009-02-20 12:42:24.000000000 +0100 +++ generator/qtscript_masterinclude.h 2011-09-27 09:38:10.798171231 +0200 @@ -35,9 +35,7 @@ # include <QtXmlPatterns/QtXmlPatterns> #endif -#ifndef QT_NO_WEBKIT # include <QtWebKit/QtWebKit> -#endif #ifndef QT_NO_PHONON # include <phonon/phonon> continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
