Hello community,
here is the log from the commit of package yast2-xml
checked in at Mon Nov 20 19:02:54 CET 2006.
--------
--- yast2-xml/yast2-xml.changes 2006-08-28 17:51:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-xml/yast2-xml.changes 2006-10-27 12:50:29.000000000 +0200
@@ -2 +2 @@
-Mon Aug 28 17:42:17 CEST 2006 - mvidner@suse.cz
+Fri Oct 27 12:48:05 CEST 2006 - mvidner@suse.cz
@@ -4,4 +4,5 @@
-- Do not try to interpret entities in YCP strings (#187618).
- Fixes autoyast profiles that are supposed to contain "&", like
- "iso:" add-on URLs.
-- 2.13.3
+- Removed dependencies that were present only because of YCP code
+ (that had been moved to yast2.rpm long ago).
+- Removed an explicit dependency on libxcrypt-devel, only
+ yast2-core-devel needs it.
+- 2.14.0
Old:
----
yast2-xml-2.13.3.tar.bz2
New:
----
yast2-xml-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-xml.spec ++++++
--- /var/tmp/diff_new_pack.2wgzKs/_old 2006-11-20 19:01:51.000000000 +0100
+++ /var/tmp/diff_new_pack.2wgzKs/_new 2006-11-20 19:01:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-xml (Version 2.13.3)
+# spec file for package yast2-xml (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,17 @@
Name: yast2-xml
URL: http://www.suse.de/
-Version: 2.13.3
+Version: 2.14.0
Release: 1
-License: GPL
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-xml-2.13.3.tar.bz2
+Source0: yast2-xml-2.14.0.tar.bz2
prefix: /usr
-BuildRequires: doxygen gcc-c++ libxcrypt-devel yast2-core-devel yast2-devtools
+BuildRequires: doxygen gcc-c++ yast2-core-devel yast2-devtools
Summary: YaST2 - XML Agent
Requires: libxml2
-Requires: yast2
+Requires: yast2-core
Provides: yast2-agent-xml yast2-agent-xml-devel yast2-lib-xml
Obsoletes: yast2-agent-xml yast2-agent-xml-devel yast2-lib-xml
@@ -36,7 +36,7 @@
Anas Nashif
%prep
-%setup -n yast2-xml-2.13.3
+%setup -n yast2-xml-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,11 +68,12 @@
%doc %{prefix}/share/doc/packages/yast2-xml
%changelog -n yast2-xml
-* Mon Aug 28 2006 - mvidner@suse.cz
-- Do not try to interpret entities in YCP strings (#187618).
- Fixes autoyast profiles that are supposed to contain "&", like
- "iso:" add-on URLs.
-- 2.13.3
+* Fri Oct 27 2006 - mvidner@suse.cz
+- Removed dependencies that were present only because of YCP code
+ (that had been moved to yast2.rpm long ago).
+- Removed an explicit dependency on libxcrypt-devel, only
+ yast2-core-devel needs it.
+- 2.14.0
* Thu Jun 01 2006 - visnov@suse.cz
- De-register error handler when not parsing anymore (#175197)
- 2.13.2
++++++ yast2-xml-2.13.3.tar.bz2 -> yast2-xml-2.14.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/Makefile.am new/yast2-xml-2.14.0/Makefile.am
--- old/yast2-xml-2.13.3/Makefile.am 2006-08-29 16:54:12.000000000 +0200
+++ new/yast2-xml-2.14.0/Makefile.am 2006-11-20 15:08:20.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/Makefile.in new/yast2-xml-2.14.0/Makefile.in
--- old/yast2-xml-2.13.3/Makefile.in 2006-08-29 16:54:50.000000000 +0200
+++ new/yast2-xml-2.14.0/Makefile.in 2006-11-20 15:08:53.000000000 +0100
@@ -164,9 +164,7 @@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
@@ -238,15 +236,14 @@
ystartupdir = @ystartupdir@
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
@@ -257,7 +254,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
@@ -775,7 +772,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
@CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$<
dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/VERSION new/yast2-xml-2.14.0/VERSION
--- old/yast2-xml-2.13.3/VERSION 2006-08-28 17:39:08.000000000 +0200
+++ new/yast2-xml-2.14.0/VERSION 2006-10-27 12:49:38.000000000 +0200
@@ -1 +1 @@
-2.13.3
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/conf/Makefile.in new/yast2-xml-2.14.0/conf/Makefile.in
--- old/yast2-xml-2.13.3/conf/Makefile.in 2006-08-29 16:54:48.000000000 +0200
+++ new/yast2-xml-2.14.0/conf/Makefile.in 2006-11-20 15:08:51.000000000 +0100
@@ -129,9 +129,7 @@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/configure new/yast2-xml-2.14.0/configure
--- old/yast2-xml-2.13.3/configure 2006-08-29 16:54:36.000000000 +0200
+++ new/yast2-xml-2.14.0/configure 2006-11-20 15:08:45.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-xml 2.13.3.
+# Generated by GNU Autoconf 2.59 for yast2-xml 2.14.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-xml'
PACKAGE_TARNAME='yast2-xml'
-PACKAGE_VERSION='2.13.3'
-PACKAGE_STRING='yast2-xml 2.13.3'
+PACKAGE_VERSION='2.14.0'
+PACKAGE_STRING='yast2-xml 2.14.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -466,7 +466,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir XML2_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR a
m__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE XML_CPPFLAGS XML_LIBS LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC YDOXYGEN CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir XML2_CONFIG CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR a
m__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE XML_CPPFLAGS XML_LIBS LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -959,7 +959,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-xml 2.13.3 to adapt to many kinds of systems.
+\`configure' configures yast2-xml 2.14.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-xml 2.13.3:";;
+ short | recursive ) echo "Configuration of yast2-xml 2.14.0:";;
esac
cat <<\_ACEOF
@@ -1172,7 +1172,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-xml configure 2.13.3
+yast2-xml configure 2.14.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1186,7 +1186,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-xml $as_me 2.13.3, which was
+It was created by yast2-xml $as_me 2.14.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1916,7 +1916,7 @@
# Define the identity of the package.
PACKAGE='yast2-xml'
- VERSION='2.13.3'
+ VERSION='2.14.0'
cat >>confdefs.h <<_ACEOF
@@ -2127,7 +2127,7 @@
-VERSION="2.13.3"
+VERSION="2.14.0"
RPMNAME="yast2-xml"
MAINTAINER="Martin Vidner "
@@ -2203,7 +2203,6 @@
-
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -3782,6 +3781,8 @@
{ (exit 1); exit 1; }; }
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -3819,145 +3820,6 @@
-# Extract the first word of "ycpdoc", so it can be a program name with args.
-set dummy ycpdoc; 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_YCPDOC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $YCPDOC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPDOC="$YCPDOC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$devtools_ybindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPDOC="$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
-
- test -z "$ac_cv_path_YCPDOC" && ac_cv_path_YCPDOC="false"
- ;;
-esac
-fi
-YCPDOC=$ac_cv_path_YCPDOC
-
-if test -n "$YCPDOC"; then
- echo "$as_me:$LINENO: result: $YCPDOC" >&5
-echo "${ECHO_T}$YCPDOC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "$YCPDOC" = "false"; then
- { { echo "$as_me:$LINENO: error: ycpdoc is not installed" >&5
-echo "$as_me: error: ycpdoc is not installed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-# Extract the first word of "ycpmakedep", so it can be a program name with args.
-set dummy ycpmakedep; 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_YCPMAKEDEP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $YCPMAKEDEP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPMAKEDEP="$YCPMAKEDEP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$devtools_ybindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPMAKEDEP="$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
-
- test -z "$ac_cv_path_YCPMAKEDEP" && ac_cv_path_YCPMAKEDEP="false"
- ;;
-esac
-fi
-YCPMAKEDEP=$ac_cv_path_YCPMAKEDEP
-
-if test -n "$YCPMAKEDEP"; then
- echo "$as_me:$LINENO: result: $YCPMAKEDEP" >&5
-echo "${ECHO_T}$YCPMAKEDEP" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "$YCPMAKEDEP" = "false"; then
- { { echo "$as_me:$LINENO: error: ycpmakedep is not installed" >&5
-echo "$as_me: error: ycpmakedep is not installed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-# Extract the first word of "ycpc", so it can be a program name with args.
-set dummy ycpc; 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_YCPC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $YCPC in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_YCPC="$YCPC" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:$bindir"
-for as_dir in $as_dummy
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_YCPC="$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
-
- test -z "$ac_cv_path_YCPC" && ac_cv_path_YCPC="false"
- ;;
-esac
-fi
-YCPC=$ac_cv_path_YCPC
-
-if test -n "$YCPC"; then
- echo "$as_me:$LINENO: result: $YCPC" >&5
-echo "${ECHO_T}$YCPC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test "$YCPC" = "false"; then
- { { echo "$as_me:$LINENO: error: ycpc is not installed" >&5
-echo "$as_me: error: ycpc is not installed" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
# Extract the first word of "ydoxygen", so it can be a program name with args.
set dummy ydoxygen; ac_word=$2
@@ -6144,7 +6006,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6147 "configure"' > conftest.$ac_ext
+ echo '#line 6009 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7045,7 +6907,7 @@
# Provide some information about the compiler.
-echo "$as_me:7048:" \
+echo "$as_me:6910:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -8108,11 +7970,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:8111: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7973: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8115: \$? = $ac_status" >&5
+ echo "$as_me:7977: \$? = $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.
@@ -8376,11 +8238,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:8379: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8241: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8383: \$? = $ac_status" >&5
+ echo "$as_me:8245: \$? = $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.
@@ -8480,11 +8342,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:8483: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8345: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8487: \$? = $ac_status" >&5
+ echo "$as_me:8349: \$? = $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
@@ -10825,7 +10687,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:13130: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13272: \$? = $ac_status" >&5
+ echo "$as_me:13134: \$? = $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.
@@ -13369,11 +13231,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:13372: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13376: \$? = $ac_status" >&5
+ echo "$as_me:13238: \$? = $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
@@ -14939,11 +14801,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:14942: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14804: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14946: \$? = $ac_status" >&5
+ echo "$as_me:14808: \$? = $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.
@@ -15043,11 +14905,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:15046: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14908: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15050: \$? = $ac_status" >&5
+ echo "$as_me:14912: \$? = $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
@@ -17246,11 +17108,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:17249: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17111: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17253: \$? = $ac_status" >&5
+ echo "$as_me:17115: \$? = $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.
@@ -17514,11 +17376,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:17517: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17379: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17521: \$? = $ac_status" >&5
+ echo "$as_me:17383: \$? = $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.
@@ -17618,11 +17480,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:17621: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17483: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17625: \$? = $ac_status" >&5
+ echo "$as_me:17487: \$? = $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
@@ -21221,7 +21083,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-xml $as_me 2.13.3, which was
+This file was extended by yast2-xml $as_me 2.14.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21284,7 +21146,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-xml config.status 2.13.3
+yast2-xml config.status 2.14.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -21565,6 +21427,7 @@
s,@LN_S@,$LN_S,;t t
s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
+s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t
s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t
s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t
s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t
@@ -21574,9 +21437,6 @@
s,@STYLESHEET_CSS@,$STYLESHEET_CSS,;t t
s,@STYLESHEET_YDOC@,$STYLESHEET_YDOC,;t t
s,@STYLESHEET_YCPDOC@,$STYLESHEET_YCPDOC,;t t
-s,@YCPDOC@,$YCPDOC,;t t
-s,@YCPMAKEDEP@,$YCPMAKEDEP,;t t
-s,@YCPC@,$YCPC,;t t
s,@YDOXYGEN@,$YDOXYGEN,;t t
s,@CXX@,$CXX,;t t
s,@CXXFLAGS@,$CXXFLAGS,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/configure.in new/yast2-xml-2.14.0/configure.in
--- old/yast2-xml-2.13.3/configure.in 2006-08-29 16:54:12.000000000 +0200
+++ new/yast2-xml-2.14.0/configure.in 2006-11-20 15:08:20.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-xml
dnl
-dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-xml, 2.13.3, http://bugs.opensuse.org/, yast2-xml)
+AC_INIT(yast2-xml, 2.14.0, http://bugs.opensuse.org/, yast2-xml)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.3"
+VERSION="2.14.0"
RPMNAME="yast2-xml"
MAINTAINER="Martin Vidner "
@@ -91,7 +91,6 @@
-
AM_PATH_XML2
dnl Checks for programs.
@@ -113,6 +112,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -133,19 +134,6 @@
AC_SUBST(STYLESHEET_YCPDOC)
-AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir)
-if test "$YCPDOC" = "false"; then
- AC_MSG_ERROR([ycpdoc is not installed])
-fi
-AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir)
-if test "$YCPMAKEDEP" = "false"; then
- AC_MSG_ERROR([ycpmakedep is not installed])
-fi
-AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
-if test "$YCPC" = "false"; then
- AC_MSG_ERROR([ycpc is not installed])
-fi
-
AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir)
if test "$YDOXYGEN" = "false"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/configure.in.in new/yast2-xml-2.14.0/configure.in.in
--- old/yast2-xml-2.13.3/configure.in.in 2006-08-28 15:57:43.000000000 +0200
+++ new/yast2-xml-2.14.0/configure.in.in 2006-10-27 10:50:02.000000000 +0200
@@ -2,7 +2,6 @@
## initialize
@YAST2-INIT-COMMON@
-@YAST2-INIT-YCP@
@YAST2-INIT-PROGRAM@
## special stuff
@@ -10,7 +9,6 @@
## some common checks
@YAST2-CHECKS-COMMON@
-@YAST2-CHECKS-YCP@
@YAST2-CHECKS-PROGRAM@
## and generate the output
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/doc/Makefile.in new/yast2-xml-2.14.0/doc/Makefile.in
--- old/yast2-xml-2.13.3/doc/Makefile.in 2006-08-29 16:54:48.000000000 +0200
+++ new/yast2-xml-2.14.0/doc/Makefile.in 2006-11-20 15:08:52.000000000 +0100
@@ -142,9 +142,7 @@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/doc/autodocs/Makefile.in new/yast2-xml-2.14.0/doc/autodocs/Makefile.in
--- old/yast2-xml-2.13.3/doc/autodocs/Makefile.in 2006-08-29 16:54:49.000000000 +0200
+++ new/yast2-xml-2.14.0/doc/autodocs/Makefile.in 2006-11-20 15:08:52.000000000 +0100
@@ -157,9 +157,7 @@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/doc/xml.html new/yast2-xml-2.14.0/doc/xml.html
--- old/yast2-xml-2.13.3/doc/xml.html 2006-08-28 17:52:20.000000000 +0200
+++ new/yast2-xml-2.14.0/doc/xml.html 2006-01-11 16:15:38.000000000 +0100
@@ -1,23 +1,24 @@
<HTML>
<HEAD>
<TITLE>XML agent description</TITLE>
-<!-- $Id: xml.html 32599 2006-08-28 15:53:55Z mvidner $ -->
+<!-- $Id: xml.html 26962 2006-01-11 15:15:38Z mvidner $ -->
</HEAD>
<BODY>
<H1>XML agent description</H1>
<HR>
<H2>Purpose</H2>
-The XML agent (<TT>ag_xml</TT>) is used to access to create XML documents from
+The XML agent (<TT>ag_XML</TT>) is used to access to create XML documents from
YCP data structures and also read XML files into YCP.
It is part of YaST2 SCR, the system configuration repository,
used to access configuration data on the target system. The general
-SCR API allows <TT>Read()</TT> and <TT>Execute()</TT> access to get and
+SCR API allows <TT>Read()</TT> and <TT>Write()</TT> access to get and
change data.
<P>
<H2>Implementation</H2>
-The agent is implemented using the libxml2 library.
+The agent is implemented using the XML extensions of the Qt library. Parsing and
+creating the documents is done using the DOM classes of the Qt library.
<P>
<I><B>Note:</B> The complete development documentation is available in the
<A HREF="autodocs/index.html"><TT>autodocs/</TT></A> directory.</I>
@@ -25,7 +26,7 @@
<P>
<H2>Interface for XML-agent</H2>
The interface is implemented as a SCR agent with the usual <TT>Read()</TT>
-and <TT>Execute()</TT> interfaces (no Write). The path prefix used is
+and <TT>Write()</TT> interfaces. The path prefix used is
<UL><TT>.xml</TT></UL>
@@ -42,20 +43,16 @@
To read an XML file into ycp, the following syntax is required:
<p>
-string Read(.xml,"<I>file_name</I>");
+Read(.xml,"<file_name>");
<p>
-string Read(.xml.string,"<?xml version='1.0'?>...");
-<p>
-string Read(.xml.error_message); contains the error string from the xml parser.
+Read(.xml.error_message); contains the error string from the xml parser.
It should be used when the agent did not return content.
A reset happens before a new XML parsing starts.
-<H2>Execute options</H2>
-To write an XML file from ycp, the following syntax is required:
-<p>
-Execute(.xml,$[<options map>], $[ycp data]);
-<p>
-string Execute(.xml.string,$[<options map>], $[ycp data]);
+<H2>Write options</H2>
+To write an XML file into ycp, the following syntax is required:
+<br>
+Write(.xml,$[<options map>], $[ycp data]);
<p>
The options map contains the following data:
<ul>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/src/Makefile.in new/yast2-xml-2.14.0/src/Makefile.in
--- old/yast2-xml-2.13.3/src/Makefile.in 2006-08-29 16:54:49.000000000 +0200
+++ new/yast2-xml-2.14.0/src/Makefile.in 2006-11-20 15:08:52.000000000 +0100
@@ -162,9 +162,7 @@
XML2_CONFIG = @XML2_CONFIG@
XML_CPPFLAGS = @XML_CPPFLAGS@
XML_LIBS = @XML_LIBS@
-YCPC = @YCPC@
-YCPDOC = @YCPDOC@
-YCPMAKEDEP = @YCPMAKEDEP@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-xml-2.13.3/src/XmlAgent.cc new/yast2-xml-2.14.0/src/XmlAgent.cc
--- old/yast2-xml-2.13.3/src/XmlAgent.cc 2006-08-28 17:52:21.000000000 +0200
+++ new/yast2-xml-2.14.0/src/XmlAgent.cc 2006-10-13 12:28:07.000000000 +0200
@@ -7,7 +7,7 @@
* Authors:
* Anas Nashif
*
- * $Id: XmlAgent.cc 32599 2006-08-28 15:53:55Z mvidner $
+ * $Id: XmlAgent.cc 31246 2006-06-01 13:08:48Z visnov $
*/
#include "XmlAgent.h"
@@ -497,7 +497,7 @@
y2debug("string found");
xmlNodePtr val = xmlNewChild(param, NULL, (const xmlChar *)"value", NULL);
- xmlNewTextChild(val, NULL, (const xmlChar *)"string", (const xmlChar *)paramList->value(i)->asString()->value().c_str());
+ xmlNewChild(val, NULL, (const xmlChar *)"string", (const xmlChar *)paramList->value(i)->asString()->value().c_str());
}
}
}
@@ -521,8 +521,7 @@
{
if (list->value(i)->isString())
{
- // do not interpret entities, #187618
- xmlNewTextChild(parent, NULL,
+ xmlNewChild(parent, NULL,
(const xmlChar *)entry,
(const xmlChar *)list->value(i)->asString()->value().c_str());
}
@@ -586,7 +585,7 @@
if ( i.value()->isString() && !isCDATA(i.key()->asString()))
{
y2debug("not cdata");
- xmlNewTextChild(parent, NULL,
+ xmlNewChild(parent, NULL,
(const xmlChar *)(const xmlChar *)i.key()->asString()->value().c_str(),
(const xmlChar *)i.value()->asString()->value().c_str());
continue;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org