Hello community,
here is the log from the commit of package libzypp-testsuite-tools for
openSUSE:Factory checked in at 2015-07-22 09:19:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-10 10:19:54.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new/libzypp-testsuite-tools.changes
2015-07-22 09:19:43.000000000 +0200
@@ -3,0 +4,7 @@
+- Cleanup include files. Prepare code to allow further
+ libzypp changes dues to (FATE#318099) without breaking.
+- version 5.0.1
+
+-------------------------------------------------------------------
+Tue Sep 9 17:45:41 CEST 2014 - [email protected]
+
Old:
----
zypp-testsuite-tools-5.0.0.tar.bz2
New:
----
zypp-testsuite-tools-5.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-testsuite-tools.spec ++++++
--- /var/tmp/diff_new_pack.xGf427/_old 2015-07-22 09:19:44.000000000 +0200
+++ /var/tmp/diff_new_pack.xGf427/_new 2015-07-22 09:19:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libzypp-testsuite-tools
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,9 +26,9 @@
Summary: Package, Patch, Pattern, and Product Management -
testsuite-tools
License: GPL-2.0
Group: System/Packages
-Version: 5.0.0
+Version: 5.0.1
Release: 0
-Source: zypp-testsuite-tools-5.0.0.tar.bz2
+Source: zypp-testsuite-tools-5.0.1.tar.bz2
%description
Package, Patch, Pattern, and Product Management - testsuite-tools
@@ -45,7 +45,7 @@
Ladislav Slezak <[email protected]>
%prep
-%setup -q -n zypp-testsuite-tools-5.0.0
+%setup -q -n zypp-testsuite-tools-5.0.1
%build
mv configure.ac x
++++++ zypp-testsuite-tools-5.0.0.tar.bz2 -> zypp-testsuite-tools-5.0.1.tar.bz2
++++++
++++ 24328 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zypp-testsuite-tools-5.0.0/VERSION new/zypp-testsuite-tools-5.0.1/VERSION
--- old/zypp-testsuite-tools-5.0.0/VERSION 2014-09-08 13:16:03.000000000
+0200
+++ new/zypp-testsuite-tools-5.0.1/VERSION 2015-07-09 16:59:15.000000000
+0200
@@ -49,5 +49,5 @@
m4_define([LIBZYPPTESTSUITE_MINOR], [0])
m4_define([LIBZYPPTESTSUITE_COMPATMINOR], [0])
dnl ==================================================
-m4_define([LIBZYPPTESTSUITE_PATCH], [0])
+m4_define([LIBZYPPTESTSUITE_PATCH], [1])
dnl ==================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zypp-testsuite-tools-5.0.0/compile new/zypp-testsuite-tools-5.0.1/compile
--- old/zypp-testsuite-tools-5.0.0/compile 1970-01-01 01:00:00.000000000
+0100
+++ new/zypp-testsuite-tools-5.0.1/compile 2015-06-25 12:43:23.000000000
+0200
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <[email protected]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <[email protected]> or send patches to
+# <[email protected]>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <[email protected]>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zypp-testsuite-tools-5.0.0/config.h.in
new/zypp-testsuite-tools-5.0.1/config.h.in
--- old/zypp-testsuite-tools-5.0.0/config.h.in 2014-09-08 13:16:14.000000000
+0200
+++ new/zypp-testsuite-tools-5.0.1/config.h.in 2015-07-13 12:17:24.000000000
+0200
@@ -33,8 +33,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zypp-testsuite-tools-5.0.0/missing new/zypp-testsuite-tools-5.0.1/missing
--- old/zypp-testsuite-tools-5.0.0/missing 2014-03-03 09:28:12.000000000
+0100
+++ new/zypp-testsuite-tools-5.0.1/missing 2015-06-25 12:43:23.000000000
+0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/zypp-testsuite-tools-5.0.0/src/deptestomatic.cc
new/zypp-testsuite-tools-5.0.1/src/deptestomatic.cc
--- old/zypp-testsuite-tools-5.0.0/src/deptestomatic.cc 2014-09-08
13:16:03.000000000 +0200
+++ new/zypp-testsuite-tools-5.0.1/src/deptestomatic.cc 2015-07-13
12:17:13.000000000 +0200
@@ -36,6 +36,8 @@
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
+#define ZYPP_USE_RESOLVER_INTERNALS
+
#include "zypp/ZYpp.h"
#include "zypp/ZYppFactory.h"
#include "zypp/ResObjects.h"
@@ -88,6 +90,13 @@
using zypp::solver::detail::XmlNode_Ptr;
//-----------------------------------------------------------------------------
+namespace zypp {
+ namespace solver {
+ namespace detail {
+ typedef shared_ptr<Resolver> MyResolver_Ptr;
+ }
+ }
+}
static bool show_mediaid = false;
@@ -331,7 +340,7 @@
return;
}
-static void print_problems( zypp::solver::detail::Resolver_Ptr resolver )
+static void print_problems( zypp::solver::detail::MyResolver_Ptr resolver )
{
ResolverProblemList problems = resolver->problems();
problems.sort( compare_problems() );
@@ -530,7 +539,7 @@
// collect all installed items in a set
void
-print_pool( zypp::solver::detail::Resolver_Ptr resolver, const string & prefix
= "", bool show_all = true, string show_licence = "false", bool verbose = false
)
+print_pool( zypp::solver::detail::MyResolver_Ptr resolver, const string &
prefix = "", bool show_all = true, string show_licence = "false", bool verbose
= false )
{
SortItem info( show_all );
cout << "Current pool: " << God->pool().size() << endl;
@@ -703,7 +712,7 @@
{
forceResolve = true;
}
- else if ( node->equals("ignorealreadyrecommended") )
+ else if ( node->equals("ignorealreadyrecommended") ||
node->equals("ignorealready") )
{
ignorealreadyrecommended = true;
}
@@ -873,7 +882,7 @@
sat::Pool satpool( sat::Pool::instance() );
- zypp::solver::detail::Resolver_Ptr resolver = new
zypp::solver::detail::Resolver( pool );
+ zypp::solver::detail::MyResolver_Ptr resolver( new
zypp::solver::detail::Resolver( pool ) );
resolver->setForceResolve( forceResolve );
resolver->setIgnoreAlreadyRecommended( ignorealreadyrecommended );
resolver->setOnlyRequires( onlyRequires );
