Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Aug 6 02:00:48 CEST 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-07-22 12:05:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-08-05 15:43:49.285640000 +0200
@@ -1,0 +2,23 @@
+Tue Aug 5 14:55:43 CEST 2008 - lslezak@suse.cz
+
+- fixed searching for the candidate package - prefer better
+ architecture to better version (bnc#413150)
+- 2.17.4
+
+-------------------------------------------------------------------
+Wed Jul 30 11:52:01 CEST 2008 - lslezak@suse.cz
+
+- Pkg::Connect() - set LastError() (bnc#280537)
+
+-------------------------------------------------------------------
+Wed Jul 30 10:41:19 CEST 2008 - lslezak@suse.cz
+
+- allow priority >99 in Pkg::SourceSet() (bnc#402135)
+
+-------------------------------------------------------------------
+Wed Jul 23 16:12:56 CEST 2008 ma@suse.de
+
+- Remove references to obsolete freshens dependencies.
+- 2.17.3
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.17.2.tar.bz2
New:
----
yast2-pkg-bindings-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.a26220/_old 2008-08-06 02:00:40.000000000 +0200
+++ /var/tmp/diff_new_pack.a26220/_new 2008-08-06 02:00:40.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.2)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.17.2
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.2.tar.bz2
+Source0: yast2-pkg-bindings-2.17.4.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
@@ -38,7 +45,7 @@
Ladislav Slez�k
%prep
-%setup -n yast2-pkg-bindings-2.17.2
+%setup -n yast2-pkg-bindings-2.17.4
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
@@ -69,7 +76,6 @@
%dir %{prefix}/share/doc/packages/yast2-pkg-bindings
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING
%exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README
-
%changelog
* Fri May 16 2008 lslezak@suse.cz
- documented lock API
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.a26220/_old 2008-08-06 02:00:40.000000000 +0200
+++ /var/tmp/diff_new_pack.a26220/_new 2008-08-06 02:00:40.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.17.2)
+# spec file for package yast2-pkg-bindings (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-pkg-bindings
-Version: 2.17.2
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.17.2.tar.bz2
+Source0: yast2-pkg-bindings-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 5.0.0
@@ -40,7 +47,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.17.2
+%setup -n yast2-pkg-bindings-2.17.4
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -71,8 +78,18 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so.*
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
-
%changelog
+* Tue Aug 05 2008 lslezak@suse.cz
+- fixed searching for the candidate package - prefer better
+ architecture to better version (bnc#413150)
+- 2.17.4
+* Wed Jul 30 2008 lslezak@suse.cz
+- Pkg::Connect() - set LastError() (bnc#280537)
+* Wed Jul 30 2008 lslezak@suse.cz
+- allow priority >99 in Pkg::SourceSet() (bnc#402135)
+ Wed Jul 23 16:12:56 CEST 2008 ma@suse.de
+- Remove references to obsolete freshens dependencies.
+- 2.17.3
* Tue Jul 22 2008 coolo@suse.de
- 2.17.2 (for add-on)
* Thu Jul 17 2008 ma@suse.de
++++++ yast2-pkg-bindings-2.17.2.tar.bz2 -> yast2-pkg-bindings-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/configure new/yast2-pkg-bindings-2.17.4/configure
--- old/yast2-pkg-bindings-2.17.2/configure 2008-07-22 12:05:10.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/configure 2008-08-05 15:31:43.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.2.
+# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.17.2'
-PACKAGE_STRING='yast2-pkg-bindings 2.17.2'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-pkg-bindings 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -899,6 +899,9 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
AGENT_LIBADD
SED
GREP
@@ -914,7 +917,6 @@
ac_ct_F77
LIBTOOL
ALLOCA
-PKG_CONFIG
ZYPP_CFLAGS
ZYPP_LIBS
XSLTPROC
@@ -941,10 +943,12 @@
CC
CFLAGS
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
CXXCPP
F77
FFLAGS
-PKG_CONFIG
ZYPP_CFLAGS
ZYPP_LIBS'
@@ -1449,7 +1453,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 2.17.2 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1524,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.2:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1558,10 +1562,13 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ Y2CORE_CFLAGS
+ C compiler flags for Y2CORE, overriding pkg-config
+ Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
- PKG_CONFIG path to pkg-config utility
ZYPP_CFLAGS C compiler flags for ZYPP, overriding pkg-config
ZYPP_LIBS linker flags for ZYPP, overriding pkg-config
@@ -1629,7 +1636,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.17.2
+yast2-pkg-bindings configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1643,7 +1650,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 2.17.2, which was
+It was created by yast2-pkg-bindings $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2464,7 +2471,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.17.2'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2692,7 +2699,7 @@
-VERSION="2.17.2"
+VERSION="2.17.4"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -4857,8 +4864,247 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+
+
+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.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for Y2CORE" >&5
+echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; }
+
+if test -n "$Y2CORE_CFLAGS"; then
+ pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$Y2CORE_LIBS"; then
+ pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _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`
+ else
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$Y2CORE_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://pkg-config.freedesktop.org/.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS
+ Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+fi
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
@@ -5578,7 +5824,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5581 "configure"' > conftest.$ac_ext
+ echo '#line 5827 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7933,11 +8179,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7936: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8182: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7940: \$? = $ac_status" >&5
+ echo "$as_me:8186: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8223,11 +8469,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8226: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8230: \$? = $ac_status" >&5
+ echo "$as_me:8476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8327,11 +8573,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8330: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8576: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8334: \$? = $ac_status" >&5
+ echo "$as_me:8580: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10691,7 +10937,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:13441: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13199: \$? = $ac_status" >&5
+ echo "$as_me:13445: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13296,11 +13542,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13299: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13545: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13303: \$? = $ac_status" >&5
+ echo "$as_me:13549: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14879,11 +15125,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14882: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15128: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14886: \$? = $ac_status" >&5
+ echo "$as_me:15132: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14983,11 +15229,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14986: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15232: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14990: \$? = $ac_status" >&5
+ echo "$as_me:15236: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17190,11 +17436,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17193: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17439: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17197: \$? = $ac_status" >&5
+ echo "$as_me:17443: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17480,11 +17726,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17483: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17487: \$? = $ac_status" >&5
+ echo "$as_me:17733: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17584,11 +17830,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17587: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17833: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17591: \$? = $ac_status" >&5
+ echo "$as_me:17837: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20800,126 +21046,6 @@
-
-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.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-
-fi
-
pkg_failed=no
{ echo "$as_me:$LINENO: checking for ZYPP" >&5
echo $ECHO_N "checking for ZYPP... $ECHO_C" >&6; }
@@ -21574,7 +21700,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 2.17.2, which was
+This file was extended by yast2-pkg-bindings $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21627,7 +21753,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.17.2
+yast2-pkg-bindings config.status 2.17.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21981,6 +22107,9 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim
+Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim
AGENT_LIBADD!$AGENT_LIBADD$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
@@ -21996,7 +22125,6 @@
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
ALLOCA!$ALLOCA$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
ZYPP_CFLAGS!$ZYPP_CFLAGS$ac_delim
ZYPP_LIBS!$ZYPP_LIBS$ac_delim
XSLTPROC!$XSLTPROC$ac_delim
@@ -22011,7 +22139,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/configure.in new/yast2-pkg-bindings-2.17.4/configure.in
--- old/yast2-pkg-bindings-2.17.2/configure.in 2008-07-22 12:04:59.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/configure.in 2008-08-05 15:31:30.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.17.2, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.17.4, 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="2.17.2"
+VERSION="2.17.4"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -144,8 +144,14 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+PKG_CHECK_EXISTS([yast2-core],[
+ PKG_CHECK_MODULES(Y2CORE, yast2-core)
+])
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/doc/autodocs/Makefile.in new/yast2-pkg-bindings-2.17.4/doc/autodocs/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/doc/autodocs/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/doc/autodocs/Makefile.in 2008-08-05 15:31:46.000000000 +0200
@@ -148,6 +148,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/doc/Makefile.in new/yast2-pkg-bindings-2.17.4/doc/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/doc/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/doc/Makefile.in 2008-08-05 15:31:46.000000000 +0200
@@ -145,6 +145,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/Makefile.in new/yast2-pkg-bindings-2.17.4/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/Makefile.in 2008-08-05 15:31:47.000000000 +0200
@@ -167,6 +167,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/pkg-bindings.pot new/yast2-pkg-bindings-2.17.4/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.17.2/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.4/pkg-bindings.pot 2007-12-12 16:36:49.000000000 +0100
@@ -0,0 +1,148 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-12 16:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. help text
+#: src/HelpTexts.h:36
+msgid "<P><BIG><B>Loading Available Packages</B></BIG></P><P>Loading available objects from the configured repositories is in progress. This may take a while...</P>"
+msgstr ""
+
+#. help text
+#: src/HelpTexts.h:42
+msgid "<P><BIG><B>Loading Installed Packages</B><BIG></P><P>The package manager is reading installed packages...</P>"
+msgstr ""
+
+#. help text
+#: src/HelpTexts.h:47
+msgid "<P><BIG><B>Registering a New Repository</B></BIG></P><P>A new repository is being registered. The package manager is reading list of available packages in the repository...</P>"
+msgstr ""
+
+#: src/HelpTexts.h:52
+msgid "<P><BIG><B>Saving Repositories</B></BIG></P><P>The package manager is updating configured repositories...</P>"
+msgstr ""
+
+#: src/HelpTexts.h:55
+msgid "<P><BIG><B>Refreshing the Repository</B></BIG></P><P>The package manager is updating the repository content...</P>"
+msgstr ""
+
+#: src/Source_Callbacks.cc:129
+msgid "Refreshing repository "
+msgstr ""
+
+#: src/Source_Callbacks.cc:150
+msgid "Probing repository "
+msgstr ""
+
+#: src/Source_Create.cc:51
+msgid "Scanning products in "
+msgstr ""
+
+#: src/Source_Create.cc:593
+msgid "Search Available Products"
+msgstr ""
+
+#: src/Source_Create.cc:598
+msgid "Probe Source Type"
+msgstr ""
+
+#: src/Source_Create.cc:601
+msgid "Download Descriptions"
+msgstr ""
+
+#: src/Source_Create.cc:602 src/Source_Download.cc:243 src/Source_Load.cc:112
+#: src/Source_Load.cc:304
+msgid "Rebuild Cache"
+msgstr ""
+
+#: src/Source_Create.cc:606 src/Source_Load.cc:113 src/Source_Load.cc:305
+#: src/Source_Set.cc:75
+msgid "Load Data"
+msgstr ""
+
+#: src/Source_Create.cc:609
+msgid "Adding the Repository..."
+msgstr ""
+
+#: src/Source_Download.cc:45 src/Source_Download.cc:173
+msgid "Downloading "
+msgstr ""
+
+#. stages: "download", "build cache"
+#: src/Source_Download.cc:242
+msgid "Refresh Metadata"
+msgstr ""
+
+#. 3 steps per repository (download, cache rebuild, load resolvables)
+#: src/Source_Download.cc:250
+msgid "Refreshing Repository..."
+msgstr ""
+
+#. error message (followed by detailed description)
+#: src/Source_Installation.cc:69
+msgid "Error: Cannot copy the cache to the target directory\n"
+msgstr ""
+
+#. error message (followed by directory name)
+#: src/Source_Installation.cc:103
+msgid "Cannot create directory "
+msgstr ""
+
+#. error message
+#: src/Source_Installation.cc:133
+msgid "Copying failed"
+msgstr ""
+
+#: src/Source_Load.cc:111 src/Source_Load.cc:303
+msgid "Refresh Sources"
+msgstr ""
+
+#. 3 steps per repository (download, cache rebuild, load resolvables)
+#: src/Source_Load.cc:118 src/Source_Load.cc:308 src/Source_Set.cc:82
+#: src/Target_Load.cc:65 src/Target_Load.cc:129
+msgid "Loading the Package Manager..."
+msgstr ""
+
+#: src/Source_Load.cc:302
+msgid "Load Sources"
+msgstr ""
+
+#. TODO: improve the error message
+#: src/Source_Misc.cc:72
+msgid "Cannot find source"
+msgstr ""
+
+#: src/Source_Save.cc:112
+msgid "Remove Repositories"
+msgstr ""
+
+#. stages: "download", "build cache"
+#: src/Source_Save.cc:117
+msgid "Save Repositories"
+msgstr ""
+
+#. start the process
+#: src/Source_Save.cc:125
+msgid "Saving Repositories..."
+msgstr ""
+
+#: src/Target_Load.cc:61
+msgid "Initialize the Target System"
+msgstr ""
+
+#: src/Target_Load.cc:62 src/Target_Load.cc:125
+msgid "Read Installed Packages"
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Callbacks_Register.cc new/yast2-pkg-bindings-2.17.4/src/Callbacks_Register.cc
--- old/yast2-pkg-bindings-2.17.2/src/Callbacks_Register.cc 2008-06-27 10:49:17.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/Callbacks_Register.cc 2008-08-05 15:38:46.000000000 +0200
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Callbacks_Register.cc 48572 2008-06-27 08:49:17Z lslezak $
+ File: $Id: Callbacks_Register.cc 49526 2008-07-30 13:28:18Z mvidner $
Author: Ladislav Slezák
Summary: Functions for registering YCP callbacks from Yast
Namespace: Pkg
@@ -547,7 +547,7 @@
}
/**
- * @builtin CallbackSourceProbeStart
+ * @builtin CallbackSourceReportStart
* @short Register callback function
* @param string args Name of the callback handler function. Required callback prototype is <code>void(integer source_id, string url, string task)</code>.
* @return void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Makefile.in new/yast2-pkg-bindings-2.17.4/src/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/src/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/Makefile.in 2008-08-05 15:31:46.000000000 +0200
@@ -173,6 +173,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Package.cc new/yast2-pkg-bindings-2.17.4/src/Package.cc
--- old/yast2-pkg-bindings-2.17.2/src/Package.cc 2008-07-14 14:59:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/Package.cc 2008-08-05 15:38:46.000000000 +0200
@@ -1892,7 +1892,7 @@
/**
- * @builtin Reset
+ * @builtin PkgReset
*
* @short Reset most internal stuff on the package manager.
@return boolean
@@ -1922,7 +1922,7 @@
/**
- * @builtin Reset
+ * @builtin PkgApplReset
*
* @short Reset most internal stuff on the package manager.
Reset only packages set by the application, not by the user
@@ -2047,7 +2047,7 @@
If it has, dependencies will be solved and the returned result might be false.
*/
-
+#warning Freshens is obsolete
YCPBoolean
PkgFunctions::PkgFreshen()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/PkgFunctions.cc new/yast2-pkg-bindings-2.17.4/src/PkgFunctions.cc
--- old/yast2-pkg-bindings-2.17.2/src/PkgFunctions.cc 2008-06-13 14:07:25.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/PkgFunctions.cc 2008-08-05 15:38:46.000000000 +0200
@@ -43,6 +43,9 @@
// textdomain
#include
+/*
+ Textdomain "pkg-bindings"
+*/
/////////////////////////////////////////////////////////////////////////////
@@ -92,8 +95,13 @@
zypp_pointer = zypp::getZYpp();
return zypp_pointer;
}
- catch (...)
+ catch (const zypp::Exception &excpt)
{
+ // is it the last attempt?
+ if (max_count == 1)
+ {
+ ZYPP_RETHROW(excpt);
+ }
}
max_count--;
@@ -104,8 +112,12 @@
}
}
- // still not initialized, throw an exception
- ZYPP_THROW (zypp::Exception(std::string("Cannot connect to the package manager")));
+ if (zypp_pointer == NULL)
+ {
+ // still not initialized, throw an exception
+ // translators: this is an error message
+ ZYPP_THROW (zypp::Exception(std::string(_("Cannot connect to the package manager"))));
+ }
return zypp_pointer;
}
@@ -143,8 +155,15 @@
{
return YCPBoolean(zypp_ptr() != NULL);
}
- catch(...)
+ catch(const zypp::ZYppFactoryException &excpt)
+ {
+ y2error("Error in Connect: FactoryException: %s", excpt.asString().c_str());
+ _last_error.setLastError(excpt.asString());
+ }
+ catch (const zypp::Exception& excpt)
{
+ y2error("Error in Connect: Exception: %s", excpt.asString().c_str());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
return YCPBoolean(false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/ProvideProcess.cc new/yast2-pkg-bindings-2.17.4/src/ProvideProcess.cc
--- old/yast2-pkg-bindings-2.17.2/src/ProvideProcess.cc 2008-05-23 16:27:25.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/ProvideProcess.cc 2008-07-30 14:29:18.000000000 +0200
@@ -65,18 +65,24 @@
provider.status().resetTransact(whoWantsIt);
}
+ // get the provider arch
+ zypp::Arch provider_arch(provider->arch());
+
// regarding items which are installable only
- if (!provider->arch().compatibleWith( _architecture )) {
- y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider->arch().asString().c_str());
+ if (!provider_arch.compatibleWith( _architecture )) {
+ y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider_arch.asString().c_str());
}
else if (!item) { // no provider yet
item = provider;
}
- else if (item->arch().compare( provider->arch() ) < 0) { // provider has better arch
+ else if (item->arch().compare( provider_arch ) < 0) { // provider has better arch
item = provider;
}
- else if (item->edition().compare( provider->edition() ) < 0) {
- item = provider; // provider has better edition
+ // provider has better edition, but doesn't have worse architecture (item has better or same)
+ else if (item->edition().compare( provider->edition() ) < 0
+ && item->arch().compare( provider_arch ) <= 0)
+ {
+ item = provider;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.17.4/src/Resolvable_Properties.cc
--- old/yast2-pkg-bindings-2.17.2/src/Resolvable_Properties.cc 2008-07-14 14:59:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/Resolvable_Properties.cc 2008-07-29 07:07:30.000000000 +0200
@@ -356,7 +356,6 @@
_kinds.insert("obsoletes");
_kinds.insert("recommends");
_kinds.insert("suggests");
- _kinds.insert("freshens");
_kinds.insert("enhances");
_kinds.insert("supplements");
YCPList ycpdeps;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Source_Load.cc new/yast2-pkg-bindings-2.17.4/src/Source_Load.cc
--- old/yast2-pkg-bindings-2.17.2/src/Source_Load.cc 2008-04-11 15:07:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/src/Source_Load.cc 2008-08-05 15:38:46.000000000 +0200
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Load.cc 46410 2008-04-11 13:07:46Z lslezak $
+ File: $Id: Source_Load.cc 49526 2008-07-30 13:28:18Z mvidner $
Author: Ladislav Slezák
Summary: Functions for initializing the package manager
Namespace: Pkg
@@ -157,14 +157,6 @@
return YCPVoid();
}
-/****************************************************************************************
- * @builtin SourceLoad
- *
- * @short Load resolvables from the installation sources
- * @description
- * Refresh the pool - Add/remove resolvables from the enabled/disabled sources.
- * @return boolean True on success
- **/
YCPValue
PkgFunctions::SourceLoadImpl(PkgProgress &progress)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Source_Set.cc new/yast2-pkg-bindings-2.17.4/src/Source_Set.cc
--- old/yast2-pkg-bindings-2.17.2/src/Source_Set.cc 2008-03-27 11:40:46.000000000 +0100
+++ new/yast2-pkg-bindings-2.17.4/src/Source_Set.cc 2008-07-30 10:42:04.000000000 +0200
@@ -19,7 +19,7 @@
*/
/*
- File: $Id: Source_Set.cc 45782 2008-03-27 10:40:46Z lslezak $
+ File: $Id: Source_Set.cc 49505 2008-07-30 08:42:04Z lslezak $
Author: Ladislav Slezák
Summary: Functions for changing properties of a repository
Namespace: Pkg
@@ -205,16 +205,9 @@
{
unsigned int priority = descr->value(YCPString("priority"))->asInteger()->value();
- if (priority > 99)
- {
- y2error("Wrong priority '%d', valid range is 0-99", priority);
- }
- else
- {
- // set the priority
- repo->repoInfo().setPriority(priority);
- y2debug("set priority: %d", priority);
- }
+ // set the priority
+ repo->repoInfo().setPriority(priority);
+ y2debug("set priority: %d", priority);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/testsuite/devel/Makefile.in new/yast2-pkg-bindings-2.17.4/testsuite/devel/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/testsuite/devel/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/testsuite/devel/Makefile.in 2008-08-05 15:31:46.000000000 +0200
@@ -137,6 +137,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/testsuite/Makefile.in new/yast2-pkg-bindings-2.17.4/testsuite/Makefile.in
--- old/yast2-pkg-bindings-2.17.2/testsuite/Makefile.in 2008-07-22 12:05:13.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/testsuite/Makefile.in 2008-08-05 15:31:46.000000000 +0200
@@ -135,6 +135,8 @@
XML_CATALOG = @XML_CATALOG@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/VERSION new/yast2-pkg-bindings-2.17.4/VERSION
--- old/yast2-pkg-bindings-2.17.2/VERSION 2008-07-22 11:50:49.000000000 +0200
+++ new/yast2-pkg-bindings-2.17.4/VERSION 2008-08-05 14:57:21.000000000 +0200
@@ -1 +1 @@
-2.17.2
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org