Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2012-09-25 14:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2012-05-16 15:04:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2012-09-25 14:28:48.000000000 +0200 @@ -1,0 +2,27 @@ +Tue Sep 25 08:02:00 UTC 2012 - [email protected] + +- license update: SUSE-LGPL-2.1-with-nokia-exception-1.1 + Choose the LGPL-2.1 variant of the dual license choice (the other option + is a commercial license) + +------------------------------------------------------------------- +Fri Sep 21 13:08:55 UTC 2012 - [email protected] + +- Update to 2.6.0-beta + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/2.6/dist/changes-2.6.0 + for the complete changelog +- a botan copy is now in KDE:Qt, use system-botan-lib.diff unconditionally + +------------------------------------------------------------------- +Mon Sep 17 19:04:35 UTC 2012 - [email protected] + +- rpm has no %elseif + +------------------------------------------------------------------- +Wed Jul 25 13:13:31 UTC 2012 - [email protected] + +- Update to 2.5.1 + See https://qt.gitorious.org/qt-creator/qt-creator/blobs/v2.5.1/dist/changes-2.5.1 + for the complete changelog + +------------------------------------------------------------------- Old: ---- qt-creator-2.5.0-src.tar.gz New: ---- qt-creator-2.6.0-beta-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.2PvxvC/_old 2012-09-25 14:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2PvxvC/_new 2012-09-25 14:28:50.000000000 +0200 @@ -17,13 +17,13 @@ Name: qt-creator -Version: 2.5.0 +Version: 2.5.82 Release: 0 Summary: Lightweight IDE -License: LGPL-2.1 ; LGPL-2.1+ ; MIT +License: SUSE-LGPL-2.1-with-nokia-exception-1.1 Group: Development/Tools/IDE Url: http://www.qtsoftware.com/developer/qt-creator/ -%define rversion 2.5.0 +%define rversion 2.6.0-beta Source: http://get.qt.nokia.com/qtcreator/%{name}-%{rversion}-src.tar.gz Source1: qtcreator.desktop Patch1: system-botan-lib.diff @@ -37,6 +37,7 @@ %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: libQtWebKit-devel +BuildRequires: libbotan-devel >= 1.10.2 BuildRequires: libqt4-devel >= 4.7.4 BuildRequires: libqt4-private-headers-devel BuildRequires: update-desktop-files @@ -44,9 +45,7 @@ Recommends: libqt4-debuginfo Recommends: libqt4-devel-doc %endif -%if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210 -BuildRequires: libbotan-devel >= 1.8.0 -%endif + ######################################################################################### # Fedora, RHEL or CentOS ######################################################################################### @@ -63,8 +62,8 @@ %prep %setup -q -n %{name}-%rversion-src -%if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210 -%patch1 +%if 0%{?suse_version} +%patch1 -p1 %endif %patch2 @@ -94,9 +93,11 @@ rm -rfv %{buildroot}%{_datadir}/doc/qtcreator %if 0%{?suse_version} %suse_update_desktop_file -i qtcreator Development Qt IDE -%elseif 0%{?fedora_version} +%else +%if 0%{?fedora_version} desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ --add-category Development --add-category Qt --add-category IDE qtcreator.desktop %endif +%endif %fdupes %{buildroot} %if 0 cd share/qtcreator/gdbmacros @@ -115,7 +116,6 @@ %dir %{_datadir}/icons/hicolor/*/apps %dir %{_docdir}/libqt4/qch %doc %{_docdir}/libqt4/qch/qtcreator.qch -%{_bindir}/qmlprofiler %{_bindir}/qmlpuppet %{_bindir}/qtcreator %{_bindir}/qtcreator_process_stub ++++++ hardcoded-runpath.diff ++++++ --- /var/tmp/diff_new_pack.2PvxvC/_old 2012-09-25 14:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.2PvxvC/_new 2012-09-25 14:28:51.000000000 +0200 @@ -1,6 +1,6 @@ ---- src/qtcreatorplugin.pri 2011-11-20 11:58:43.057821655 +0100 -+++ src/qtcreatorplugin.pri.new 2011-11-20 11:58:38.461879432 +0100 -@@ -63,13 +63,7 @@ +--- src/qtcreatorplugin.pri.old 2012-09-12 02:13:04.229836044 +0200 ++++ src/qtcreatorplugin.pri 2012-09-12 02:13:31.987487083 +0200 +@@ -81,13 +81,7 @@ QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ } } else:linux-* { @@ -14,4 +14,4 @@ + QMAKE_RPATHDIR += /usr/$$IDE_LIBRARY_BASENAME/qtcreator } - + # put .pro file directory in INCLUDEPATH ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.2PvxvC/_old 2012-09-25 14:28:51.000000000 +0200 +++ /var/tmp/diff_new_pack.2PvxvC/_new 2012-09-25 14:28:51.000000000 +0200 @@ -1,13 +1,17 @@ ---- src/libs/3rdparty/botan/botan.pri 2012-05-09 14:13:19.000000000 +0200 -+++ src/libs/3rdparty/botan/botan.pri 2012-05-13 19:53:16.599828913 +0200 +diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri +index 20832c1..4b715c0 100644 +--- a/src/libs/3rdparty/botan/botan.pri ++++ b/src/libs/3rdparty/botan/botan.pri @@ -1,2 +1,2 @@ --INCLUDEPATH *= $$PWD/build +-INCLUDEPATH *= $$PWD/.. -LIBS *= -l$$qtLibraryName(Botan) -+INCLUDEPATH *= /usr/include -+LIBS *= -lbotan ---- src/libs/libs.pro 2012-05-09 14:13:19.000000000 +0200 -+++ src/libs/libs.pro 2012-05-13 19:53:45.854461132 +0200 -@@ -5,7 +5,6 @@ ++INCLUDEPATH *= /usr/include/botan-1.10 ++LIBS *= -lbotan-1.10 +diff --git a/src/libs/libs.pro b/src/libs/libs.pro +index 5eaf471..9a1da2d 100644 +--- a/src/libs/libs.pro ++++ b/src/libs/libs.pro +@@ -5,7 +5,6 @@ QT += core gui # aggregation and extensionsystem are directly in src.pro # because of dependencies of app SUBDIRS = \ @@ -15,3 +19,76 @@ utils \ utils/process_stub.pro \ languageutils \ +diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp +index 3e1b697..e17aaca 100644 +--- a/src/libs/ssh/sshcryptofacility.cpp ++++ b/src/libs/ssh/sshcryptofacility.cpp +@@ -38,6 +38,11 @@ + #include "sshpacket_p.h" + + #include <botan/botan.h> ++#include <botan/cbc.h> ++#include <botan/dsa.h> ++#include <botan/pkcs8.h> ++#include <botan/pubkey.h> ++#include <botan/rsa.h> + + #include <QDebug> + #include <QList> +diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h +index 5b22429..a3a7b1a 100644 +--- a/src/libs/ssh/sshcryptofacility_p.h ++++ b/src/libs/ssh/sshcryptofacility_p.h +@@ -32,6 +32,7 @@ + #define SSHABSTRACTCRYPTOFACILITY_P_H + + #include <botan/botan.h> ++#include <botan/hmac.h> + + #include <QByteArray> + #include <QScopedPointer> +diff --git a/src/libs/ssh/sshkeyexchange.cpp b/src/libs/ssh/sshkeyexchange.cpp +index c11201c..93538a2 100644 +--- a/src/libs/ssh/sshkeyexchange.cpp ++++ b/src/libs/ssh/sshkeyexchange.cpp +@@ -37,6 +37,12 @@ + #include "sshincomingpacket_p.h" + + #include <botan/botan.h> ++#include <botan/dh.h> ++#include <botan/dl_group.h> ++#include <botan/dsa.h> ++#include <botan/pem.h> ++#include <botan/pubkey.h> ++#include <botan/rsa.h> + + #ifdef CREATOR_SSH_DEBUG + #include <iostream> +diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp +index ef28c05..ca42f56 100644 +--- a/src/libs/ssh/sshkeygenerator.cpp ++++ b/src/libs/ssh/sshkeygenerator.cpp +@@ -35,6 +35,11 @@ + #include "sshpacket_p.h" + + #include <botan/botan.h> ++#include <botan/der_enc.h> ++#include <botan/dsa.h> ++#include <botan/pem.h> ++#include <botan/pkcs8.h> ++#include <botan/rsa.h> + + #include <QDateTime> + #include <QInputDialog> +diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h +index 0bd0413..fb5201f 100644 +--- a/src/libs/ssh/sshkeypasswordretriever_p.h ++++ b/src/libs/ssh/sshkeypasswordretriever_p.h +@@ -31,6 +31,7 @@ + #define KEYPASSWORDRETRIEVER_H + + #include <botan/botan.h> ++#include <botan/ui.h> + + #include <string> + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
