Hello community, here is the log from the commit of package qca for openSUSE:12.1 checked in at 2011-10-24 20:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/qca (Old) and /work/SRC/openSUSE:12.1/.qca.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qca", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1/qca/qca.changes 2011-10-24 13:22:55.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.qca.new/qca.changes 2011-10-24 20:21:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Oct 24 15:23:32 UTC 2011 - coolo@suse.com + +- work around for a very great qmake workaround + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qca.spec ++++++ --- /var/tmp/diff_new_pack.WBSJLK/_old 2011-10-24 20:21:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WBSJLK/_new 2011-10-24 20:21:22.000000000 +0200 @@ -62,7 +62,6 @@ %patch1 %build -P=$PWD export PATH=/usr/lib/qt3/bin/:$PATH export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" @@ -70,16 +69,20 @@ make %{?jobs:-j %jobs} cd examples qmake -#make CXXFLAGS="$CXXFLAGS -I$P/src" LFLAGS="-L$P" -#make clean cd ../../%name-tls-%version ./configure make %{?jobs:-j %jobs} %install -make install INSTALL_ROOT=$RPM_BUILD_ROOT/usr/lib/qt3/%_lib/usr/ +if test -w /usr/src/packages/BUILD; then + # qmake of qt3 is pure crap + INSTALL_ROOT=$RPM_BUILD_ROOT/usr/lib/qt3/%_lib/usr/ +else + INSTALL_ROOT=$RPM_BUILD_ROOT +fi +make install INSTALL_ROOT=$INSTALL_ROOT cd ../%name-tls-%version -make install INSTALL_ROOT=$RPM_BUILD_ROOT/usr/lib/qt3/%_lib/usr/ +make install INSTALL_ROOT=$INSTALL_ROOT if [ %_lib = lib64 ]; then rm -rf $RPM_BUILD_ROOT/usr/lib/qt3/%_lib mv $RPM_BUILD_ROOT/usr/lib/qt3/lib \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org