Hello community, here is the log from the commit of package libzypp-testsuite-tools for openSUSE:Factory checked in at 2014-09-10 07:28:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp-testsuite-tools (Old) and /work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp-testsuite-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp-testsuite-tools/libzypp-testsuite-tools.changes 2014-08-13 08:49:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new/libzypp-testsuite-tools.changes 2014-09-10 10:19:54.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 9 17:45:41 CEST 2014 - ma@suse.de + +- Drop graphical PkgUI and YOU commands as required libraries were + dropped due to lack of QT5 support. The binary was renamed to + deptestomatic. Legacy symlinks for deptestomatic.multi and + deptestomatic.noui are provided. +- version 5.0.0 + +------------------------------------------------------------------- Old: ---- zypp-testsuite-tools-4.4.2.tar.bz2 New: ---- zypp-testsuite-tools-5.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-testsuite-tools.spec ++++++ --- /var/tmp/diff_new_pack.kGlLjW/_old 2014-09-10 10:19:55.000000000 +0200 +++ /var/tmp/diff_new_pack.kGlLjW/_new 2014-09-10 10:19:55.000000000 +0200 @@ -18,24 +18,17 @@ Name: libzypp-testsuite-tools BuildRequires: fdupes -BuildRequires: gcc-c++ >= 4.5 +BuildRequires: gcc-c++ >= 4.6 BuildRequires: libexpat-devel -BuildRequires: libqdialogsolver1-devel -BuildRequires: libqt4-devel BuildRequires: libtool -BuildRequires: libzypp-devel >= 13.7.0 -%if 0%{?suse_version} <= 1220 -BuildRequires: yast2-libyui-devel -%else -BuildRequires: libyui-devel -%endif +BuildRequires: libzypp-devel >= 14.28.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management - testsuite-tools License: GPL-2.0 Group: System/Packages -Version: 4.4.2 +Version: 5.0.0 Release: 0 -Source: zypp-testsuite-tools-4.4.2.tar.bz2 +Source: zypp-testsuite-tools-5.0.0.tar.bz2 %description Package, Patch, Pattern, and Product Management - testsuite-tools @@ -52,7 +45,7 @@ Ladislav Slezak <lslezak@suse.cz> %prep -%setup -q -n zypp-testsuite-tools-4.4.2 +%setup -q -n zypp-testsuite-tools-5.0.0 %build mv configure.ac x @@ -65,6 +58,9 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +# legacy symlinks +ln -s deptestomatic $RPM_BUILD_ROOT/%{_prefix}/lib/zypp/testsuite/bin/deptestomatic.multi +ln -s deptestomatic $RPM_BUILD_ROOT/%{_prefix}/lib/zypp/testsuite/bin/deptestomatic.noui %fdupes -s $RPM_BUILD_ROOT %clean ++++++ zypp-testsuite-tools-4.4.2.tar.bz2 -> zypp-testsuite-tools-5.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/Makefile.in new/zypp-testsuite-tools-5.0.0/Makefile.in --- old/zypp-testsuite-tools-4.4.2/Makefile.in 2014-08-01 11:41:22.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/Makefile.in 2014-09-08 13:16:15.000000000 +0200 @@ -256,8 +256,6 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTDIR = @QTDIR@ -QTLIBDIR = @QTLIBDIR@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/VERSION new/zypp-testsuite-tools-5.0.0/VERSION --- old/zypp-testsuite-tools-4.4.2/VERSION 2014-08-01 11:41:11.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/VERSION 2014-09-08 13:16:03.000000000 +0200 @@ -44,10 +44,10 @@ dnl set COMPATMINOR to MINOR. (binary incompatible change) dnl dnl ================================================== -m4_define([LIBZYPPTESTSUITE_MAJOR], [4]) +m4_define([LIBZYPPTESTSUITE_MAJOR], [5]) dnl ================================================== -m4_define([LIBZYPPTESTSUITE_MINOR], [4]) +m4_define([LIBZYPPTESTSUITE_MINOR], [0]) m4_define([LIBZYPPTESTSUITE_COMPATMINOR], [0]) dnl ================================================== -m4_define([LIBZYPPTESTSUITE_PATCH], [2]) +m4_define([LIBZYPPTESTSUITE_PATCH], [0]) dnl ================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/configure new/zypp-testsuite-tools-5.0.0/configure --- old/zypp-testsuite-tools-4.4.2/configure 2014-08-01 11:41:20.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/configure 2014-09-08 13:16:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for zypp-testsuite-tools 4.4.2. +# Generated by GNU Autoconf 2.69 for zypp-testsuite-tools 5.0.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='zypp-testsuite-tools' PACKAGE_TARNAME='zypp-testsuite-tools' -PACKAGE_VERSION='4.4.2' -PACKAGE_STRING='zypp-testsuite-tools 4.4.2' +PACKAGE_VERSION='5.0.0' +PACKAGE_STRING='zypp-testsuite-tools 5.0.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -633,8 +633,6 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -QTLIBDIR -QTDIR CPP OTOOL64 OTOOL @@ -775,8 +773,6 @@ with_gnu_ld with_sysroot enable_libtool_lock -with_qt_dir -with_qt_libdir ' ac_precious_vars='build_alias host_alias @@ -1331,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zypp-testsuite-tools 4.4.2 to adapt to many kinds of systems. +\`configure' configures zypp-testsuite-tools 5.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1399,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zypp-testsuite-tools 4.4.2:";; + short | recursive ) echo "Configuration of zypp-testsuite-tools 5.0.0:";; esac cat <<\_ACEOF @@ -1432,8 +1428,6 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-qt-dir=DIR where the root of Qt is installed. - --with-qt-libdir=DIR where the Qt library is installed. Some influential environment variables: CC C compiler command @@ -1514,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zypp-testsuite-tools configure 4.4.2 +zypp-testsuite-tools configure 5.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1913,7 +1907,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zypp-testsuite-tools $as_me 4.4.2, which was +It was created by zypp-testsuite-tools $as_me 5.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2889,7 +2883,7 @@ # Define the identity of the package. PACKAGE='zypp-testsuite-tools' - VERSION='4.4.2' + VERSION='5.0.0' cat >>confdefs.h <<_ACEOF @@ -15883,23 +15877,6 @@ -QTDIR="/usr/lib/qt4" -QTLIBDIR="/usr/lib" - -# Check whether --with-qt-dir was given. -if test "${with_qt_dir+set}" = set; then : - withval=$with_qt_dir; QTDIR="$withval" -fi - - -# Check whether --with-qt-libdir was given. -if test "${with_qt_libdir+set}" = set; then : - withval=$with_qt_libdir; QTLIBDIR="$withval" -fi - - - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -16471,7 +16448,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zypp-testsuite-tools $as_me 4.4.2, which was +This file was extended by zypp-testsuite-tools $as_me 5.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16537,7 +16514,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zypp-testsuite-tools config.status 4.4.2 +zypp-testsuite-tools config.status 5.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/configure.ac new/zypp-testsuite-tools-5.0.0/configure.ac --- old/zypp-testsuite-tools-4.4.2/configure.ac 2014-07-01 11:48:55.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/configure.ac 2014-09-08 13:16:03.000000000 +0200 @@ -54,20 +54,6 @@ AC_PROG_INSTALL AM_PROG_LIBTOOL -dnl Check qt paths -QTDIR="/usr/lib/qt4" -QTLIBDIR="/usr/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++]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/libzypp-testsuite-tools.spec.in new/zypp-testsuite-tools-5.0.0/libzypp-testsuite-tools.spec.in --- old/zypp-testsuite-tools-4.4.2/libzypp-testsuite-tools.spec.in 2014-07-01 11:48:55.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/libzypp-testsuite-tools.spec.in 2014-09-08 13:16:03.000000000 +0200 @@ -16,15 +16,10 @@ # Name: libzypp-testsuite-tools -BuildRequires: fdupes libexpat-devel libqt4-devel libqdialogsolver1-devel -BuildRequires: gcc-c++ >= 4.5 -BuildRequires: libzypp-devel >= 13.7.0 +BuildRequires: fdupes libexpat-devel +BuildRequires: gcc-c++ >= 4.6 +BuildRequires: libzypp-devel >= 14.28.0 BuildRequires: libtool -%if 0%{?suse_version} <= 1220 -BuildRequires: yast2-libyui-devel -%else -BuildRequires: libyui-devel -%endif License: GPL-2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management - testsuite-tools @@ -61,6 +56,9 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +# legacy symlinks +ln -s deptestomatic $RPM_BUILD_ROOT/%{_prefix}/lib/zypp/testsuite/bin/deptestomatic.multi +ln -s deptestomatic $RPM_BUILD_ROOT/%{_prefix}/lib/zypp/testsuite/bin/deptestomatic.noui %fdupes -s $RPM_BUILD_ROOT %clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/src/Makefile.am new/zypp-testsuite-tools-5.0.0/src/Makefile.am --- old/zypp-testsuite-tools-4.4.2/src/Makefile.am 2014-08-01 11:41:11.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/src/Makefile.am 2014-09-08 13:16:03.000000000 +0200 @@ -1,29 +1,17 @@ # # Makefile.am for zypp/testsuite/solver/src # - -INCLUDES = -I/usr/include/libxml2 \ - -I$(prefix)/include \ - -I/usr/include/Qt \ - -DQT3_SUPPORT \ - -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" - -LDADD = -lzypp -lxml2 -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver -lyui - -# We're not ready for this yet. -#check_PROGRAMS = deptestomatic.multi -noinst_PROGRAMS = deptestomatic.noui deptestomatic.multi +noinst_PROGRAMS = deptestomatic testsuitesolversrcbindir = ${testsuitebindir} -testsuitesolversrcbin_DATA = deptestomatic.noui deptestomatic.multi +testsuitesolversrcbin_DATA = deptestomatic -deptestomatic_multi_SOURCES = \ - deptestomatic.cc \ - KeyRingCallbacks.h \ - XmlNode.cc \ +deptestomatic_SOURCES = \ + deptestomatic.cc \ + KeyRingCallbacks.h \ + XmlNode.cc \ XmlNode.h -# ---- -deptestomatic_noui_SOURCES = $(deptestomatic_multi_SOURCES) -deptestomatic_noui_CXXFLAGS = -DNOUI -deptestomatic_noui_LDADD = -lzypp -lxml2 -lexpat +deptestomatic_INCLUDES = -I/usr/include/libxml2 -I$(prefix)/include +deptestomatic_CXXFLAGS = -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -DNOUI +deptestomatic_LDADD =-lzypp -lxml2 -lexpat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/src/Makefile.in new/zypp-testsuite-tools-5.0.0/src/Makefile.in --- old/zypp-testsuite-tools-4.4.2/src/Makefile.in 2014-08-01 11:41:22.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/src/Makefile.in 2014-09-08 13:16:15.000000000 +0200 @@ -14,10 +14,6 @@ @SET_MAKE@ -# -# Makefile.am for zypp/testsuite/solver/src -# - VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' @@ -84,8 +80,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -noinst_PROGRAMS = deptestomatic.noui$(EXEEXT) \ - deptestomatic.multi$(EXEEXT) +noinst_PROGRAMS = deptestomatic$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -98,24 +93,18 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am_deptestomatic_multi_OBJECTS = deptestomatic.$(OBJEXT) \ - XmlNode.$(OBJEXT) -deptestomatic_multi_OBJECTS = $(am_deptestomatic_multi_OBJECTS) -deptestomatic_multi_LDADD = $(LDADD) -deptestomatic_multi_DEPENDENCIES = +am_deptestomatic_OBJECTS = deptestomatic-deptestomatic.$(OBJEXT) \ + deptestomatic-XmlNode.$(OBJEXT) +deptestomatic_OBJECTS = $(am_deptestomatic_OBJECTS) +deptestomatic_DEPENDENCIES = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am__objects_1 = deptestomatic_noui-deptestomatic.$(OBJEXT) \ - deptestomatic_noui-XmlNode.$(OBJEXT) -am_deptestomatic_noui_OBJECTS = $(am__objects_1) -deptestomatic_noui_OBJECTS = $(am_deptestomatic_noui_OBJECTS) -deptestomatic_noui_DEPENDENCIES = -deptestomatic_noui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ +deptestomatic_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ - $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(deptestomatic_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -168,9 +157,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(deptestomatic_multi_SOURCES) $(deptestomatic_noui_SOURCES) -DIST_SOURCES = $(deptestomatic_multi_SOURCES) \ - $(deptestomatic_noui_SOURCES) +SOURCES = $(deptestomatic_SOURCES) +DIST_SOURCES = $(deptestomatic_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -286,8 +274,6 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -QTDIR = @QTDIR@ -QTLIBDIR = @QTLIBDIR@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -354,26 +340,17 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ zyppdir = @zyppdir@ -INCLUDES = -I/usr/include/libxml2 \ - -I$(prefix)/include \ - -I/usr/include/Qt \ - -DQT3_SUPPORT \ - -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" - -LDADD = -lzypp -lxml2 -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver -lyui testsuitesolversrcbindir = ${testsuitebindir} -testsuitesolversrcbin_DATA = deptestomatic.noui deptestomatic.multi -deptestomatic_multi_SOURCES = \ - deptestomatic.cc \ - KeyRingCallbacks.h \ - XmlNode.cc \ +testsuitesolversrcbin_DATA = deptestomatic +deptestomatic_SOURCES = \ + deptestomatic.cc \ + KeyRingCallbacks.h \ + XmlNode.cc \ XmlNode.h - -# ---- -deptestomatic_noui_SOURCES = $(deptestomatic_multi_SOURCES) -deptestomatic_noui_CXXFLAGS = -DNOUI -deptestomatic_noui_LDADD = -lzypp -lxml2 -lexpat +deptestomatic_INCLUDES = -I/usr/include/libxml2 -I$(prefix)/include +deptestomatic_CXXFLAGS = -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -DNOUI +deptestomatic_LDADD = -lzypp -lxml2 -lexpat all: all-am .SUFFIXES: @@ -418,13 +395,9 @@ echo " rm -f" $$list; \ rm -f $$list -deptestomatic.multi$(EXEEXT): $(deptestomatic_multi_OBJECTS) $(deptestomatic_multi_DEPENDENCIES) $(EXTRA_deptestomatic_multi_DEPENDENCIES) - @rm -f deptestomatic.multi$(EXEEXT) - $(AM_V_CXXLD)$(CXXLINK) $(deptestomatic_multi_OBJECTS) $(deptestomatic_multi_LDADD) $(LIBS) - -deptestomatic.noui$(EXEEXT): $(deptestomatic_noui_OBJECTS) $(deptestomatic_noui_DEPENDENCIES) $(EXTRA_deptestomatic_noui_DEPENDENCIES) - @rm -f deptestomatic.noui$(EXEEXT) - $(AM_V_CXXLD)$(deptestomatic_noui_LINK) $(deptestomatic_noui_OBJECTS) $(deptestomatic_noui_LDADD) $(LIBS) +deptestomatic$(EXEEXT): $(deptestomatic_OBJECTS) $(deptestomatic_DEPENDENCIES) $(EXTRA_deptestomatic_DEPENDENCIES) + @rm -f deptestomatic$(EXEEXT) + $(AM_V_CXXLD)$(deptestomatic_LINK) $(deptestomatic_OBJECTS) $(deptestomatic_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -432,10 +405,8 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlNode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deptestomatic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deptestomatic_noui-XmlNode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deptestomatic_noui-deptestomatic.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deptestomatic-XmlNode.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deptestomatic-deptestomatic.Po@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -458,33 +429,33 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< -deptestomatic_noui-deptestomatic.o: deptestomatic.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic_noui-deptestomatic.o -MD -MP -MF $(DEPDIR)/deptestomatic_noui-deptestomatic.Tpo -c -o deptestomatic_noui-deptestomatic.o `test -f 'deptestomatic.cc' || echo '$(srcdir)/'`deptestomatic.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic_noui-deptestomatic.Tpo $(DEPDIR)/deptestomatic_noui-deptestomatic.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='deptestomatic.cc' object='deptestomatic_noui-deptestomatic.o' libtool=no @AMDEPBACKSLASH@ +deptestomatic-deptestomatic.o: deptestomatic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic-deptestomatic.o -MD -MP -MF $(DEPDIR)/deptestomatic-deptestomatic.Tpo -c -o deptestomatic-deptestomatic.o `test -f 'deptestomatic.cc' || echo '$(srcdir)/'`deptestomatic.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic-deptestomatic.Tpo $(DEPDIR)/deptestomatic-deptestomatic.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='deptestomatic.cc' object='deptestomatic-deptestomatic.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic_noui-deptestomatic.o `test -f 'deptestomatic.cc' || echo '$(srcdir)/'`deptestomatic.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic-deptestomatic.o `test -f 'deptestomatic.cc' || echo '$(srcdir)/'`deptestomatic.cc -deptestomatic_noui-deptestomatic.obj: deptestomatic.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic_noui-deptestomatic.obj -MD -MP -MF $(DEPDIR)/deptestomatic_noui-deptestomatic.Tpo -c -o deptestomatic_noui-deptestomatic.obj `if test -f 'deptestomatic.cc'; then $(CYGPATH_W) 'deptestomatic.cc'; else $(CYGPATH_W) '$(srcdir)/deptestomatic.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic_noui-deptestomatic.Tpo $(DEPDIR)/deptestomatic_noui-deptestomatic.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='deptestomatic.cc' object='deptestomatic_noui-deptestomatic.obj' libtool=no @AMDEPBACKSLASH@ +deptestomatic-deptestomatic.obj: deptestomatic.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic-deptestomatic.obj -MD -MP -MF $(DEPDIR)/deptestomatic-deptestomatic.Tpo -c -o deptestomatic-deptestomatic.obj `if test -f 'deptestomatic.cc'; then $(CYGPATH_W) 'deptestomatic.cc'; else $(CYGPATH_W) '$(srcdir)/deptestomatic.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic-deptestomatic.Tpo $(DEPDIR)/deptestomatic-deptestomatic.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='deptestomatic.cc' object='deptestomatic-deptestomatic.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic_noui-deptestomatic.obj `if test -f 'deptestomatic.cc'; then $(CYGPATH_W) 'deptestomatic.cc'; else $(CYGPATH_W) '$(srcdir)/deptestomatic.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic-deptestomatic.obj `if test -f 'deptestomatic.cc'; then $(CYGPATH_W) 'deptestomatic.cc'; else $(CYGPATH_W) '$(srcdir)/deptestomatic.cc'; fi` -deptestomatic_noui-XmlNode.o: XmlNode.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic_noui-XmlNode.o -MD -MP -MF $(DEPDIR)/deptestomatic_noui-XmlNode.Tpo -c -o deptestomatic_noui-XmlNode.o `test -f 'XmlNode.cc' || echo '$(srcdir)/'`XmlNode.cc -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic_noui-XmlNode.Tpo $(DEPDIR)/deptestomatic_noui-XmlNode.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XmlNode.cc' object='deptestomatic_noui-XmlNode.o' libtool=no @AMDEPBACKSLASH@ +deptestomatic-XmlNode.o: XmlNode.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic-XmlNode.o -MD -MP -MF $(DEPDIR)/deptestomatic-XmlNode.Tpo -c -o deptestomatic-XmlNode.o `test -f 'XmlNode.cc' || echo '$(srcdir)/'`XmlNode.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic-XmlNode.Tpo $(DEPDIR)/deptestomatic-XmlNode.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XmlNode.cc' object='deptestomatic-XmlNode.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic_noui-XmlNode.o `test -f 'XmlNode.cc' || echo '$(srcdir)/'`XmlNode.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic-XmlNode.o `test -f 'XmlNode.cc' || echo '$(srcdir)/'`XmlNode.cc -deptestomatic_noui-XmlNode.obj: XmlNode.cc -@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic_noui-XmlNode.obj -MD -MP -MF $(DEPDIR)/deptestomatic_noui-XmlNode.Tpo -c -o deptestomatic_noui-XmlNode.obj `if test -f 'XmlNode.cc'; then $(CYGPATH_W) 'XmlNode.cc'; else $(CYGPATH_W) '$(srcdir)/XmlNode.cc'; fi` -@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic_noui-XmlNode.Tpo $(DEPDIR)/deptestomatic_noui-XmlNode.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XmlNode.cc' object='deptestomatic_noui-XmlNode.obj' libtool=no @AMDEPBACKSLASH@ +deptestomatic-XmlNode.obj: XmlNode.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -MT deptestomatic-XmlNode.obj -MD -MP -MF $(DEPDIR)/deptestomatic-XmlNode.Tpo -c -o deptestomatic-XmlNode.obj `if test -f 'XmlNode.cc'; then $(CYGPATH_W) 'XmlNode.cc'; else $(CYGPATH_W) '$(srcdir)/XmlNode.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/deptestomatic-XmlNode.Tpo $(DEPDIR)/deptestomatic-XmlNode.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='XmlNode.cc' object='deptestomatic-XmlNode.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_noui_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic_noui-XmlNode.obj `if test -f 'XmlNode.cc'; then $(CYGPATH_W) 'XmlNode.cc'; else $(CYGPATH_W) '$(srcdir)/XmlNode.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deptestomatic_CXXFLAGS) $(CXXFLAGS) -c -o deptestomatic-XmlNode.obj `if test -f 'XmlNode.cc'; then $(CYGPATH_W) 'XmlNode.cc'; else $(CYGPATH_W) '$(srcdir)/XmlNode.cc'; fi` mostlyclean-libtool: -rm -f *.lo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/src/XmlNode.cc new/zypp-testsuite-tools-5.0.0/src/XmlNode.cc --- old/zypp-testsuite-tools-4.4.2/src/XmlNode.cc 2014-07-01 11:48:55.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/src/XmlNode.cc 2014-09-08 13:16:03.000000000 +0200 @@ -27,7 +27,7 @@ #include "zypp/base/Logger.h" ///////////////////////////////////////////////////////////////////////// -namespace zypp +namespace zypp { /////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////// namespace solver @@ -88,7 +88,7 @@ //--------------------------------------------------------------------------- -string +string XmlNode::getValue (const string & name, const string & deflt) const { string ret; @@ -148,7 +148,7 @@ if (ret) { // XXX << "XmlNode::getProp(" << name << ") xmlGetProp '" << (char *)ret << "'" << endl; - + gs = string ((const char *)ret); xmlFree (ret); return gs; @@ -182,18 +182,18 @@ int XmlNode::getIntValueDefault (const std::string & name, int def) const { - int z; + int z = 0; if (this->getIntValue (name, &z)) return z; else return def; } - + unsigned int XmlNode::getUnsignedIntValueDefault (const std::string & name, unsigned int def) const { - unsigned int z; + unsigned int z = 0; if (this->getUnsignedIntValue (name, &z)) return z; else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypp-testsuite-tools-4.4.2/src/deptestomatic.cc new/zypp-testsuite-tools-5.0.0/src/deptestomatic.cc --- old/zypp-testsuite-tools-4.4.2/src/deptestomatic.cc 2014-07-01 11:48:55.000000000 +0200 +++ new/zypp-testsuite-tools-5.0.0/src/deptestomatic.cc 2014-09-08 13:16:03.000000000 +0200 @@ -79,24 +79,6 @@ #include "KeyRingCallbacks.h" #include "XmlNode.h" -#ifndef NOUI -#include <qapplication.h> -#include <qdialog.h> -#include <qfiledialog.h> -#include <qpushbutton.h> -#include <qfont.h> -#include "zypp/QZyppSolverDialog.h" - -#define YUILogComponent "example" -#include <yui/YUILog.h> -#include <yui/YUI.h> -#include <yui/YWidgetFactory.h> -#include <yui/YDialog.h> -#include <yui/YLayoutBox.h> -#include <yui/YPackageSelector.h> -#include <yui/YEvent.h> -#endif - using namespace std; using namespace zypp; using zypp::ui::Selectable; @@ -210,10 +192,10 @@ std::ostream & dumpHelpOn( std::ostream & str ) { str << "\ -List of known tags. See http://en.opensuse.org/Libzypp/Testsuite_solver for details: \n\ - PkgUI YOU addConflict addQueueDelete addQueueInstall addQueueInstallOneOf addQueueLock addQueueUpdate \n\ +List of known tags. See http://old-en.opensuse.org/Libzypp/Testsuite_solver for details: \n\ + addConflict addQueueDelete addQueueInstall addQueueInstallOneOf addQueueLock addQueueUpdate \n\ addRequire allowVendorChange arch availablelocales channel createTestcase current distupgrade force-install \n\ - forceResolve graphic hardwareInfo ignorealreadyrecommended install instorder keep locale lock mediaid \n\ + forceResolve hardwareInfo ignorealreadyrecommended install instorder keep locale lock mediaid \n\ onlyRequires reportproblems setlicencebit showpool showstatus showselectable source subscribe system \n\ systemCheck takesolution uninstall update upgradeRepo validate verify whatprovides" << endl; @@ -1157,44 +1139,9 @@ cout << "Selectable '" << name << "' not valid" << endl; } else if (node->equals ("graphic")) { -#ifndef NOUI - resolver->resolvePool(); - QApplication app(NULL, 0); - QZyppSolverDialog *dialog = new QZyppSolverDialog(resolver); - app.setMainWidget( dialog ); - dialog->setCaption("Solvertree"); - dialog->setMinimumSize ( 700, 700 ); - dialog->show(); - app.exec(); -#else - RESULT << "<graphic> is not supported by deptestomatic.noui" << endl; -#endif + RESULT << "<graphic> is no longer supported by deptestomatic" << endl; } else if (node->equals ("YOU") || node->equals ("PkgUI") ) { -#ifndef NOUI - - resolver->resolvePool(); - - YUILog::setLogFileName( "/tmp/testUI.log" ); - YUILog::enableDebugLogging(); - - YDialog *dialog = YUI::widgetFactory()->createMainDialog(); - YLayoutBox *vbox = YUI::widgetFactory()->createVBox( dialog ); - - long modeFlags = 0; - if ( node->equals ("YOU") ) - modeFlags = YPkg_OnlineUpdateMode; - - YPackageSelector *pkgSelector = YUI::widgetFactory()->createPackageSelector( vbox, - modeFlags ); - dialog->setInitialSize(); - - static YUI *myUI = YUI::ui(); - myUI->runPkgSelection( pkgSelector ); - - dialog->destroy(); -#else - RESULT << "<YOU> or <PkgUI> are not supported by deptestomatic.noui" << endl; -#endif + RESULT << "<YOU> or <PkgUI> are no longer supported by deptestomatic" << endl; } else if (node->equals ("lock")) { string source_alias = node->getProp ("channel"); string package_name = node->getProp ("name"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org