Hello community, here is the log from the commit of package yast2-core checked in at Thu Aug 14 03:16:06 CEST 2008. -------- --- yast2-core/yast2-core.changes 2008-07-30 15:22:30.000000000 +0200 +++ yast2-core/yast2-core.changes 2008-08-13 16:04:39.484029000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 13 15:10:50 CEST 2008 - aschnell@suse.de + +- added tohexstring builtin with width parameter +- 2.17.8 + +------------------------------------------------------------------- +Fri Aug 8 14:56:07 CEST 2008 - locilka@suse.cz + +- Re-added support to build libycp documentation in separate files + additionally to combined.xml (needed for overall documentation). + +------------------------------------------------------------------- Old: ---- yast2-core-2.17.7.tar.bz2 New: ---- yast2-core-2.17.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.t18692/_old 2008-08-14 03:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.t18692/_new 2008-08-14 03:15:38.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-core (Version 2.17.7) +# spec file for package yast2-core (Version 2.17.8) # # 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-core -Version: 2.17.7 +Version: 2.17.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.17.7.tar.bz2 +Source0: yast2-core-2.17.8.tar.bz2 Prefix: /usr # obviously BuildRequires: gcc-c++ @@ -88,7 +95,7 @@ Stanislav Visnovsky <visnov@suse.cz> %prep -%setup -n yast2-core-2.17.7 +%setup -n yast2-core-2.17.8 %build %{prefix}/bin/y2tool y2autoconf @@ -171,6 +178,12 @@ %doc %{_datadir}/doc/yastdoc /usr/share/YaST2/data/devtools/bin/generateYCPWrappers %changelog +* Wed Aug 13 2008 aschnell@suse.de +- added tohexstring builtin with width parameter +- 2.17.8 +* Fri Aug 08 2008 locilka@suse.cz +- Re-added support to build libycp documentation in separate files + additionally to combined.xml (needed for overall documentation). * Wed Jul 30 2008 mvidner@suse.cz - Moved documentation around and adjusted it to conform with http://en.opensuse.org/YaST/yastdoc ++++++ yast2-core-2.17.7.tar.bz2 -> yast2-core-2.17.8.tar.bz2 ++++++ ++++ 15724 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/configure.in new/yast2-core-2.17.8/configure.in --- old/yast2-core-2.17.7/configure.in 2008-07-30 15:25:08.000000000 +0200 +++ new/yast2-core-2.17.8/configure.in 2008-08-13 15:37:15.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-core dnl -dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.17.7, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.17.8, http://bugs.opensuse.org/, yast2-core) 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.7" +VERSION="2.17.8" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/libycp/doc/Makefile.am new/yast2-core-2.17.8/libycp/doc/Makefile.am --- old/yast2-core-2.17.7/libycp/doc/Makefile.am 2008-07-30 14:56:11.000000000 +0200 +++ new/yast2-core-2.17.8/libycp/doc/Makefile.am 2008-08-08 16:54:10.000000000 +0200 @@ -6,7 +6,10 @@ htmldir = $(yastdocdir)/ycp builtin = $(wildcard $(srcdir)/../src/YCPBuiltin*.cc) +builtinxml := $(builtin:%.cc=%.xml) xmlfiles = combined.xml +# needed for building the overall documentation +xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml))) htmlfiles = $(wildcard html/*.html html/*/*.html) @@ -15,24 +18,31 @@ html/index.html \ $(htmlfiles) -html/index.html: $(xmlfiles) builtins.xml +html/index.html: $(xmlfilesseparated) $(xmlfiles) builtins.xml XML_CATALOG_FILES=@XML_CATALOG@ $(XSLTPROC) $(XSLTPROC_FLAGS) --xinclude @STYLESHEET_HTML@ builtins.xml YDOC := $(shell pkg-config --variable=ybindir yast2-devtools)/ydoc2 RENT := $(shell pkg-config --variable=ybindir yast2-devtools)/replace_entities + $(xmlfiles) : $(builtin) $(YDOC) -o $@.tmp $^ $(XSLTPROC) --stringparam disambiguate yes $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ $(RENT) $@ rm $@.tmp +$(xmlfilesseparated) : $(builtin) + $(YDOC) -o $@.tmp ../src/$(subst xml,cc,$@) + $(XSLTPROC) $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ + $(RENT) $@ + rm $@.tmp + html/yast2docs.css: html/index.html cp @STYLESHEET_CSS@ html cp -a `pkg-config --variable=yast2dir yast2-devtools`/data/docbook/images html EXTRA_DIST = builtins.xml -CLEANFILES = $(xmlfiles) +CLEANFILES = $(xmlfiles) $(xmlfilesseparated) clean-local: rm -rf html diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/libycp/src/YCPBuiltinString.cc new/yast2-core-2.17.8/libycp/src/YCPBuiltinString.cc --- old/yast2-core-2.17.7/libycp/src/YCPBuiltinString.cc 2008-07-28 17:48:39.000000000 +0200 +++ new/yast2-core-2.17.8/libycp/src/YCPBuiltinString.cc 2008-08-13 15:45:38.000000000 +0200 @@ -202,24 +202,51 @@ static YCPValue -s_tohexstring (const YCPInteger &i) +s_tohexstring1 (const YCPInteger &i) { /** * @builtin tohexstring + * @id tohexstring-1 * @short Converts an integer to a hexadecimal string. * @param integer number Number * @return string number in Hex * * @description - * + * * @usage tohexstring (31) -> "0x1f" */ if (i.isNull ()) return YCPNull (); - char buffer[66]; - snprintf (buffer, 66, "0x%x", int (i->value ())); + char buffer[64 + 3]; + snprintf (buffer, 64 + 3, "0x%llx", i->value ()); + return YCPString (buffer); +} + + +static YCPValue +s_tohexstring2 (const YCPInteger &i, const YCPInteger &w) +{ + /** + * @builtin tohexstring + * @id tohexstring-2 + * @short Converts an integer to a hexadecimal string. + * @param integer number Number + * @param integer width Width + * @return string number in Hex + * + * @description + * + * @usage tohexstring (31, 1) -> "0x1f" + * @usage tohexstring (31, 4) -> "0x001f" + */ + + if (i.isNull () || w.isNull()) + return YCPNull (); + + char buffer[64 + 3]; + snprintf (buffer, 64 + 3, "0x%0*llx", (int) w->value(), i->value ()); return YCPString (buffer); } @@ -514,7 +541,7 @@ * all characters that do not occur in <tt>CHARS</tt>. * * @see deletechars - * @usage filterchars ("a", "abcdefghijklmnopqrstuvwxyz") -> "ac" + * @usage filterchars ("a", "abcdefghijklmnopqrstuvwxyz") -> "a" * @usage filterchars ("abc","cde") -> "c" */ @@ -1351,7 +1378,8 @@ { "+", "string (string, symbol)", (void *)s_plus4 }, { "issubstring", "boolean (string, string)", (void *)s_issubstring }, { "tostring", "string (any)", (void *)s_tostring }, - { "tohexstring", "string (integer)", (void *)s_tohexstring }, + { "tohexstring", "string (integer)", (void *)s_tohexstring1 }, + { "tohexstring", "string (integer, integer)", (void *)s_tohexstring2 }, { "size", "integer (string)", (void *)s_size }, { "find", "integer (string, string)", (void *)s_find, DECL_DEPRECATED }, { "search", "integer (string, string)", (void *)s_search }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.err new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.err --- old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.err 2006-09-19 13:26:44.000000000 +0200 +++ new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.err 2008-08-13 15:03:31.000000000 +0200 @@ -180,3 +180,7 @@ ---------------------------------------------------------------------- tohexstring (31) ---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +tohexstring (31, 4) +---------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.out new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.out --- old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.out 2006-09-19 13:26:43.000000000 +0200 +++ new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.out 2008-08-13 15:03:14.000000000 +0200 @@ -43,3 +43,4 @@ ("63.0000") ("0.1235") ("0x1f") +("0x001f") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.ycp new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.ycp --- old/yast2-core-2.17.7/libycp/testsuite/tests/builtin/Builtin-String1.ycp 2006-09-19 13:26:46.000000000 +0200 +++ new/yast2-core-2.17.8/libycp/testsuite/tests/builtin/Builtin-String1.ycp 2008-08-13 14:59:30.000000000 +0200 @@ -82,4 +82,5 @@ (tostring (tofloat (63), 4)) (tostring (0.12345, 4)) (tohexstring (31)) +(tohexstring (31, 4)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.17.7/VERSION new/yast2-core-2.17.8/VERSION --- old/yast2-core-2.17.7/VERSION 2008-07-30 15:22:01.000000000 +0200 +++ new/yast2-core-2.17.8/VERSION 2008-08-13 15:10:43.000000000 +0200 @@ -1 +1 @@ -2.17.7 +2.17.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org