Author: schubi2 Date: Tue Aug 21 10:07:06 2007 New Revision: 6772 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6772&view=rev Log: bugfix for 64 bit architecture Modified: trunk/libzypp-testsuite/Makefile.cvs trunk/libzypp-testsuite/VERSION trunk/libzypp-testsuite/configure.ac trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes trunk/libzypp-testsuite/solvertree/src/Makefile.am Modified: trunk/libzypp-testsuite/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/Makefile.cvs?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/Makefile.cvs (original) +++ trunk/libzypp-testsuite/Makefile.cvs Tue Aug 21 10:07:06 2007 @@ -20,6 +20,8 @@ configure: init ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) \ --disable-static \ + --with-qt-dir=/usr/lib/qt3 \ + --with-qt-libdir=/usr/lib/qt3/$(LIB) \ $(CONFIGURE_OPTS) init: Modified: trunk/libzypp-testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/VERSION?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/VERSION (original) +++ trunk/libzypp-testsuite/VERSION Tue Aug 21 10:07:06 2007 @@ -49,5 +49,5 @@ m4_define([LIBZYPPTESTSUITE_MINOR], [14]) m4_define([LIBZYPPTESTSUITE_COMPATMINOR], [9]) dnl ================================================== -m4_define([LIBZYPPTESTSUITE_PATCH], [9]) +m4_define([LIBZYPPTESTSUITE_PATCH], [10]) dnl ================================================== Modified: trunk/libzypp-testsuite/configure.ac URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/configure.ac?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/configure.ac (original) +++ trunk/libzypp-testsuite/configure.ac Tue Aug 21 10:07:06 2007 @@ -54,6 +54,20 @@ AC_PROG_INSTALL AM_PROG_LIBTOOL +dnl Check qt paths +QTDIR="/usr/lib/qt3" +QTLIBDIR="/usr/lib/qt3/lib" +AC_ARG_WITH(qt-dir, + AS_HELP_STRING([--with-qt-dir=DIR], + [where the root of Qt is installed.]), + [ QTDIR="$withval" ]) +AC_ARG_WITH(qt-libdir, + AS_HELP_STRING([--with-qt-libdir=DIR], + [where the Qt library is installed.]), + [ QTLIBDIR="$withval" ]) +AC_SUBST(QTDIR) +AC_SUBST(QTLIBDIR) + dnl do AC_CHECK_* tests using c++ (e.g. boost header) AC_LANG([C++]) Modified: trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in (original) +++ trunk/libzypp-testsuite/libzypp-testsuite-tools.spec.in Tue Aug 21 10:07:06 2007 @@ -63,7 +63,7 @@ autoreconf --force --install --symlink --verbose %{?suse_update_config:%{suse_update_config -f}} CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir} --disable-static +./configure --prefix=%{prefix} --libdir=%{_libdir} --with-qt-dir=/usr/lib/qt3 --with-qt-libdir=/usr/lib/qt3/%{_lib} --mandir=%{_mandir} --disable-static make %{?jobs:-j %jobs} %ifarch %ix86 make check Modified: trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes (original) +++ trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes Tue Aug 21 10:07:06 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 21 10:06:28 CEST 2007 - schubi@suse.de + +- Bugfix for 64 bit architecture + +------------------------------------------------------------------- Mon Aug 20 21:07:59 CEST 2007 - aschnell@suse.de - added another testsuite Modified: trunk/libzypp-testsuite/solvertree/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solvertree/src/Makefile.am?rev=6772&r1=6771&r2=6772&view=diff ============================================================================== --- trunk/libzypp-testsuite/solvertree/src/Makefile.am (original) +++ trunk/libzypp-testsuite/solvertree/src/Makefile.am Tue Aug 21 10:07:06 2007 @@ -6,7 +6,7 @@ -I/usr/lib/qt3/include -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -LDADD = $(libdir)/libzypp.so $(top_srcdir)/src/helix/lib@PACKAGE@_helix.la -L/usr/lib/qt3/lib -lqt-mt -lX11 -lqdialogsolver +LDADD = $(libdir)/libzypp.so $(top_srcdir)/src/helix/lib@PACKAGE@_helix.la -L$(QTLIBDIR) -lqt-mt -lqdialogsolver noinst_PROGRAMS = solvertree solvertree_SOURCES = solvertree.cc \ No newline at end of file -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org