Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at Thu Feb 26 18:01:10 CET 2009. -------- --- libqca2/libqca2.changes 2009-02-11 20:47:30.000000000 +0100 +++ libqca2/libqca2.changes 2009-02-26 15:52:29.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 19 15:37:12 CET 2009 - dmueller@suse.de + +- fix build with gcc 4.4 +- fix build for older distros +- fix baselibs configuration + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- r928413.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.P26280/_old 2009-02-26 18:00:32.000000000 +0100 +++ /var/tmp/diff_new_pack.P26280/_new 2009-02-26 18:00:32.000000000 +0100 @@ -38,7 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://delta.affinix.com/qca/ Version: 2.0.1 -Release: 6 +Release: 7 %define tar_version %version %define with_botan 0 %define with_nss 0 @@ -48,6 +48,7 @@ Source3: qca-ossl-2.0.0-beta3.tar.bz2 Source4: qca-pkcs11-2.0.0-beta2.tar.bz2 Patch0: fix-qt-check.diff +Patch1: r928413.diff %if %suse_version > 1020 Requires: gpg2 >= 2.0.0 %endif @@ -187,6 +188,7 @@ popd cd ../../.. %setup -D -q -n qca-%{tar_version} +%patch1 %build pushd plugins @@ -230,6 +232,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files %defattr(-,root,root) @@ -278,6 +284,10 @@ %endif %changelog +* Thu Feb 19 2009 dmueller@suse.de +- fix build with gcc 4.4 +- fix build for older distros +- fix baselibs configuration * Wed Feb 11 2009 ro@suse.de - added libqca2 to baselibs.conf (required by plugins) * Tue Feb 03 2009 dmueller@suse.de ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.P26280/_old 2009-02-26 18:00:32.000000000 +0100 +++ /var/tmp/diff_new_pack.P26280/_new 2009-02-26 18:00:32.000000000 +0100 @@ -2,16 +2,16 @@ libqca2-plugin-cyrus-sasl requires "libqca2 = <version>" - supplements "packageand(libqca2:libqt4-<targettype>)" + supplements "packageand(libqca2-plugin-cyrus-sasl:libqca2-<targettype>)" libqca2-plugin-botan requires "libqca2 = <version>" - supplements "packageand(libqca2:libqt4-<targettype>)" + supplements "packageand(libqca2-plugin-botan:libqca2-<targettype>)" libqca2-plugin-pkcs11 requires "libqca2 = <version>" - supplements "packageand(libqca2:libqt4-<targettype>)" + supplements "packageand(libqca2-plugin-pkcs11:libqca2-<targettype>)" libqca2-plugin-nss requires "libqca2 = <version>" - supplements "packageand(libqca2:libqt4-<targettype>)" + supplements "packageand(libqca2-plugin-nss:libqca2-<targettype>)" ++++++ r928413.diff ++++++ ------------------------------------------------------------------------ r928413 | mueller | 2009-02-19 15:28:51 +0100 (Do, 19. Feb 2009) | 3 lines use the public Qt api, instead of implementation internals that do not build anymore ------------------------------------------------------------------------ Index: qca-pkcs11.cpp =================================================================== --- plugins/qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp +++ plugins/qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp @@ -3041,7 +3041,7 @@ pkcs11Provider::_logHook ( // Qt vsprintf cannot can NULL for %s as vsprintf does. // QCA_logTextMessage (QString ().vsprintf (format, args), severity); char buffer[2048]; - QT_VSNPRINTF (buffer, sizeof (buffer)-1, format, args); + qvsnprintf (buffer, sizeof (buffer)-1, format, args); buffer[sizeof (buffer)-1] = '\x0'; QCA_logTextMessage (buffer, severity); //@END-WORKAROUND ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org