Hello community,
here is the log from the commit of package yast2-pkg-bindings for openSUSE:13.1
checked in at 2013-10-08 15:18:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:13.1/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Changes:
--------
--- /work/SRC/openSUSE:13.1/yast2-pkg-bindings/yast2-pkg-bindings.changes
2013-09-23 11:16:23.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2013-10-08 15:18:59.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Sep 30 08:59:03 UTC 2013 - lsle...@suse.cz
+
+- evaluate DonePackage callback (to close the package installation
+ progress popup) when package installation is finished
+ (bnc#842465)
+- 3.0.3
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-3.0.2.tar.bz2
New:
----
yast2-pkg-bindings-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.MXMYFL/_old 2013-10-08 15:18:59.000000000 +0200
+++ /var/tmp/diff_new_pack.MXMYFL/_new 2013-10-08 15:18:59.000000000 +0200
@@ -18,10 +18,10 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 3.0.2
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-3.0.2.tar.bz2
+Source0: yast2-pkg-bindings-3.0.3.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.MXMYFL/_old 2013-10-08 15:18:59.000000000 +0200
+++ /var/tmp/diff_new_pack.MXMYFL/_new 2013-10-08 15:18:59.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.0.2
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-pkg-bindings-3.0.2.tar.bz2 -> yast2-pkg-bindings-3.0.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.0.2/Makefile.in
new/yast2-pkg-bindings-3.0.3/Makefile.in
--- old/yast2-pkg-bindings-3.0.2/Makefile.in 2013-09-09 17:47:18.000000000
+0200
+++ new/yast2-pkg-bindings-3.0.3/Makefile.in 2013-09-30 13:18:11.000000000
+0200
@@ -770,7 +770,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+w $(distdir)
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.0.2/VERSION
new/yast2-pkg-bindings-3.0.3/VERSION
--- old/yast2-pkg-bindings-3.0.2/VERSION 2013-09-09 17:46:51.000000000
+0200
+++ new/yast2-pkg-bindings-3.0.3/VERSION 2013-09-30 13:17:56.000000000
+0200
@@ -1 +1 @@
-3.0.2
+3.0.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.0.2/aclocal.m4
new/yast2-pkg-bindings-3.0.3/aclocal.m4
--- old/yast2-pkg-bindings-3.0.2/aclocal.m4 2013-09-09 17:47:14.000000000
+0200
+++ new/yast2-pkg-bindings-3.0.3/aclocal.m4 2013-09-30 13:18:10.000000000
+0200
@@ -1076,7 +1076,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search
path])
@@ -1122,7 +1123,8 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -1170,9 +1172,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -1206,6 +1208,46 @@
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+ [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+ [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
dnl check for docbook -*- autoconf -*-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.0.2/configure
new/yast2-pkg-bindings-3.0.3/configure
--- old/yast2-pkg-bindings-3.0.2/configure 2013-09-09 17:47:15.000000000
+0200
+++ new/yast2-pkg-bindings-3.0.3/configure 2013-09-30 13:18:10.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 3.0.2.
+# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 3.0.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='3.0.2'
-PACKAGE_STRING='yast2-pkg-bindings 3.0.2'
+PACKAGE_VERSION='3.0.3'
+PACKAGE_STRING='yast2-pkg-bindings 3.0.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1384,7 +1384,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 yast2-pkg-bindings 3.0.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-pkg-bindings 3.0.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1456,7 +1456,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 3.0.2:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 3.0.3:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1576,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 3.0.2
+yast2-pkg-bindings configure 3.0.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2029,7 +2029,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-pkg-bindings $as_me 3.0.2, which was
+It was created by yast2-pkg-bindings $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2968,7 +2968,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='3.0.2'
+ VERSION='3.0.3'
cat >>confdefs.h <<_ACEOF
@@ -3091,7 +3091,7 @@
-VERSION="3.0.2"
+VERSION="3.0.3"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lsle...@suse.cz>"
@@ -4931,6 +4931,7 @@
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
@@ -5066,6 +5067,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5082,6 +5084,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5101,9 +5104,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"yast2-core" 2>&1`
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "yast2-core" 2>&1`
else
- Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"yast2-core" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$Y2CORE_PKG_ERRORS" >&5
@@ -16041,6 +16044,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ZYPP_CFLAGS=`$PKG_CONFIG --cflags "libzypp" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -16057,6 +16061,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ZYPP_LIBS=`$PKG_CONFIG --libs "libzypp" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -16076,9 +16081,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ZYPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"libzypp" 2>&1`
+ ZYPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libzypp" 2>&1`
else
- ZYPP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libzypp" 2>&1`
+ ZYPP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libzypp" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ZYPP_PKG_ERRORS" >&5
@@ -16767,7 +16772,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 3.0.2, which was
+This file was extended by yast2-pkg-bindings $as_me 3.0.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16833,7 +16838,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-pkg-bindings config.status 3.0.2
+yast2-pkg-bindings config.status 3.0.3
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/yast2-pkg-bindings-3.0.2/configure.ac
new/yast2-pkg-bindings-3.0.3/configure.ac
--- old/yast2-pkg-bindings-3.0.2/configure.ac 2013-09-09 17:47:01.000000000
+0200
+++ new/yast2-pkg-bindings-3.0.3/configure.ac 2013-09-30 13:18:05.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! --
dnl (edit configure.ac.in or configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 3.0.2, http://bugs.opensuse.org/,
yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 3.0.3, http://bugs.opensuse.org/,
yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="3.0.2"
+VERSION="3.0.3"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.0.2/src/Callbacks.cc
new/yast2-pkg-bindings-3.0.3/src/Callbacks.cc
--- old/yast2-pkg-bindings-3.0.2/src/Callbacks.cc 2013-09-09
17:46:51.000000000 +0200
+++ new/yast2-pkg-bindings-3.0.3/src/Callbacks.cc 2013-09-30
13:17:56.000000000 +0200
@@ -288,6 +288,7 @@
{
_last = zypp::Resolvable::constPtr();
+ // for historical reasons the DonePackage callback is used for
error reporting
CB callback( ycpcb( YCPCallbacks::CB_DonePackage) );
if (callback._set) {
callback.addInt( error );
@@ -310,13 +311,24 @@
}
// note: the RpmLevel argument is not used anymore, ignore it
- virtual void finish(zypp::Resolvable::constPtr resolvable, Error error,
const std::string &reason, zypp::target::rpm::InstallResolvableReport::RpmLevel
level)
+ virtual void finish(zypp::Resolvable::constPtr resolvable, Error error,
const std::string &reason, zypp::target::rpm::InstallResolvableReport::RpmLevel
/*level*/)
{
// errors are handled in the problem() callback above, here just
log the message
if (error != zypp::target::rpm::InstallResolvableReport::NO_ERROR)
{
y2milestone("Error in finish callback: %s", reason.c_str());
}
+
+ CB callback( ycpcb( YCPCallbacks::CB_DonePackage) );
+ if (callback._set) {
+ // report no error, errors were already reported in problem()
callback above,
+ // just report real "done" status
+ callback.addInt(NO_ERROR);
+ callback.addStr(std::string(""));
+
+ // return value ignored
+ callback.evaluateStr();
+ }
}
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
