Hello community, here is the log from the commit of package tinyxml for openSUSE:Factory checked in at Tue Nov 16 00:39:00 CET 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ tinyxml/tinyxml.changes 2010-11-08 14:13:57.000000000 +0100 @@ -0,0 +1,54 @@ +------------------------------------------------------------------- +Mon Nov 8 14:12:24 CET 2010 - pth@suse.de + +- Only require autoconf 2.62. + +------------------------------------------------------------------- +Fri Nov 5 18:51:02 CET 2010 - pth@suse.de + +- Autoconfiscate the package. +- New package for factory. +- Remove stl patch as configure handles that now. + +------------------------------------------------------------------- +Wed Jun 30 00:00:00 CET 2010 - prusnak@opensuse.org + +- fix packaging + (devel package should be libtinyxml-devel not libtinyxml0-devel) + +------------------------------------------------------------------- +Fri Oct 16 00:00:00 CET 2009 - saigkill@opensuse.org + +- Reworked Spec (Provides/Obsoletes) + +------------------------------------------------------------------- +Fri Jul 31 00:00:00 CET 2009 - saigkill@opensuse.org + +- cleanup the specfile and added make clean + +------------------------------------------------------------------- +Sat Apr 18 00:00:00 CET 2009 - saigkill@opensuse.org + +- removed %%%%buildroot + +------------------------------------------------------------------- +Fri Feb 13 00:00:00 CET 2009 - saigkill@opensuse.org - 2.5.3 + +- Changed Packagename to libtinyxml + +------------------------------------------------------------------- +Thu Feb 12 00:00:00 CET 2009 - saigkill@opensuse.org - 2.5.3 + +- initial openSUSE Package +- branched for Contrib + +------------------------------------------------------------------- +Fri Dec 14 00:00:00 CET 2007 - j.w.r.degoede@hhs.nl 2.5.3-2 + +- Various improvements from review (bz 407571) + +------------------------------------------------------------------- +Fri Nov 30 00:00:00 CET 2007 - j.w.r.degoede@hhs.nl 2.5.3-1 + +- Initial Fedora Package + calling whatdependson for head-i586 New: ---- Makefile.am Makefile.am.docs configure.ac tinyxml-c_headers.patch tinyxml-entity.patch tinyxml.changes tinyxml.h.in tinyxml.spec tinyxml_2_6_1.tar.lzma use_stl_def ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tinyxml.spec ++++++ # # spec file for package tinyxml (Version 2.6.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # 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/ # %define so_version 0 Name: tinyxml Version: 2.6.1 Release: 1 %define file_version 2_6_1 %define lib_package lib%{name}%{so_version} Group: System/Libraries Summary: A simple, small, C++ XML parser License: GPLv2+ Source: %{name}_%{file_version}.tar.lzma Source1: configure.ac Source2: Makefile.am Source3: tinyxml.h.in Source4: use_stl_def Source5: Makefile.am.docs Patch0: tinyxml-c_headers.patch Patch1: tinyxml-entity.patch Url: http://sourceforge.net/projects/tinyxml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ lzma %description TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs. Have you ever found yourself writing a text file parser every time you needed to save human readable data or serialize objects? TinyXML solves the text I/O file once and for all. (Or, as a friend said, ends the Just Another Text File Parser problem.) %package -n %{lib_package} Group: System/Libraries Summary: A simple, small, C++ XML parser %description -n %{lib_package} TinyXML is a simple, small, C++ XML parser that can be easily integrating into other programs. Have you ever found yourself writing a text file parser every time you needed to save human readable data or serialize objects? TinyXML solves the text I/O file once and for all. (Or, as a friend said, ends the Just Another Text File Parser problem.) %package devel License: GPLv2+ Summary: Development files for libtinyxml Group: Development/Libraries/C and C++ Requires: %{lib_package} = %{version} Provides: libtinyxml-devel = %{version} Obsoletes: libtinyxml-devel < %{version} Suggests: %{name}-%{docs} %description devel The libtinyxml-devel package contains libraries and header files for developing applications that use libtinyxml. %package docs License: GPLv2+ Summary: Documentaqtion for libtinyxml Group: Development/Libraries/C and C++ Requires: %{name}%{so_version} = %{version} %description docs This packages contains the HTML documentation and a tutorial for libtinyxml %prep %setup -q -n tinyxml %patch0 %patch1 mkdir -p m4 cp %{S:1} %{S:2} %{S:3} %{S:4} . cp %{S:5} docs/Makefile.am rm -f tinyxml.h %build autoreconf -fi export CXXFLAGS="%{optflags}" %configure make %{?_smp_mflags} %install %makeinstall rm -f %{buildroot}%{_libdir}/*.la %clean rm -rf %{buildroot} %post -n %{lib_package} -p /sbin/ldconfig %postun -n %{lib_package} -p /sbin/ldconfig %files -n %{lib_package} %defattr(-,root,root,-) %doc changes.txt readme.txt %{_libdir}/*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %files docs %defattr(-,root,root,-) %doc docs/*.html docs/*.gif docs/*.png docs/*.css %changelog ++++++ Makefile.am ++++++ #**************************************************************************** # # Makefile for TinyXml library. # Lee Thomason # www.grinninglizard.com # # Process with automake to turn into the real Makefile #**************************************************************************** SUBDIRS = docs ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libtinyxml.la libtinyxml_la_SOURCES = tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp libtinyxml_la_LDFLAGS = -version-info 0:0:0 include_HEADERS = tinyxml.h tinystr.h check_PROGRAMS = xmltest xmltest_SOURCES = xmltest.cpp if DEBUG AM_CFLAGS := -Wall -Wno-format -g -DDEBUG AM_CXXFLAGS := ${AM_CFLAGS} AM_LDFLAGS := -g else AM_CFLAGS := -Wall -Wno-unknown-pragmas AM_CXXFLAGS := ${AM_CFLAGS} AM_LDFLAGS := endif if PROFILE AM_CFLAGS := -pg -O3 AM_CXXFLAGS := -pg -O3 AM_ LDFLAGS := -pg endif if TINYXML_USE_STL libtinyxml_la_CPPFLAGS = -DTIXML_USE_STL=1 endif EXTRA_DIST = changes.txt readme.txt tinyxml_lib.dsp tinyxmlSTL.dsp tinyXmlTestSTL.vcproj \ utf8test.xml tinyxml.dsw tinyxml_lib.vcproj tinyxmlSTL.vcproj \ tinyXmlTest.vcproj utf8test.gif echo.dsp tinyxml.sln tinyXmlTestSTL.dsp \ utf8testverify.xml use_stl_def ++++++ Makefile.am.docs ++++++ EXTRA_DIST = annotated.html \ classes.html \ classTiXmlAttribute.html \ classTiXmlAttribute-members.html \ classTiXmlAttribute.png \ classTiXmlBase.html \ classTiXmlBase-members.html \ classTiXmlBase.png \ classTiXmlComment.html \ classTiXmlComment-members.html \ classTiXmlComment.png \ classTiXmlDeclaration.html \ classTiXmlDeclaration-members.html \ classTiXmlDeclaration.png \ classTiXmlDocument.html \ classTiXmlDocument-members.html \ classTiXmlDocument.png \ classTiXmlElement.html \ classTiXmlElement-members.html \ classTiXmlElement.png \ classTiXmlHandle.html \ classTiXmlHandle-members.html \ classTiXmlNode.html \ classTiXmlNode-members.html \ classTiXmlNode.png \ classTiXmlPrinter.html \ classTiXmlPrinter-members.html \ classTiXmlPrinter.png \ classTiXmlText.html \ classTiXmlText-members.html \ classTiXmlText.png \ classTiXmlUnknown.html \ classTiXmlUnknown-members.html \ classTiXmlUnknown.png \ classTiXmlVisitor.html \ classTiXmlVisitor-members.html \ classTiXmlVisitor.png \ deprecated.html \ doxygen.css \ doxygen.png \ files.html \ functions_0x63.html \ functions_0x64.html \ functions_0x65.html \ functions_0x66.html \ functions_0x67.html \ functions_0x69.html \ functions_0x6c.html \ functions_0x6e.html \ functions_0x6f.html \ functions_0x70.html \ functions_0x71.html \ functions_0x72.html \ functions_0x73.html \ functions_0x74.html \ functions_0x75.html \ functions_0x76.html \ functions_enum.html \ functions_func_0x63.html \ functions_func_0x64.html \ functions_func_0x65.html \ functions_func_0x66.html \ functions_func_0x67.html \ functions_func_0x69.html \ functions_func_0x6c.html \ functions_func_0x6e.html \ functions_func_0x70.html \ functions_func_0x71.html \ functions_func_0x72.html \ functions_func_0x73.html \ functions_func_0x74.html \ functions_func_0x75.html \ functions_func_0x76.html \ functions_func.html \ functions.html \ functions_rela.html \ functions_vars.html \ hierarchy.html \ index.html \ Makefile.am \ pages.html \ tab_b.gif \ tab_l.gif \ tab_r.gif \ tabs.css \ tinystr_8h_source.html \ tinyxml_8h_source.html \ tutorial0.html ++++++ configure.ac ++++++ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ([2.62]) AC_INIT(tinyxml, 2.6.1, www.sourceforge.net/projects/tinyxml) AC_CONFIG_SRCDIR([tinystr.cpp]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) # Checks for programs. AC_PROG_CXX AC_PROG_CC LT_INIT([disable-static]) AC_LANG(C++) # Checks for header files. AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_INLINE AC_TYPE_SIZE_T AC_CHECK_TYPES([ptrdiff_t]) # Checks for library functions. AC_CHECK_FUNCS([memmove strchr]) AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Turn on debugging]), [case "${enableval}" in yes) debug=true ;; no) debug=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;; esac],[debug=false]) AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) AC_ARG_ENABLE([profile], AS_HELP_STRING([--enable-profiling], [Turn on profiling]), [case "${enableval}" in yes) profile=true ;; no) profile=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-profiling]) ;; esac],[profile=false]) AM_CONDITIONAL([PROFILE], [test x$profile = xtrue]) AC_ARG_ENABLE([stl], AS_HELP_STRING([--disable-stl], [Don't use STL [default is use]]), [case "${enableval}" in yes) tyx_use_stl=true ;; no) tyx_use_stl=false ;; *) AC_MSG_ERROR([bad value ${enableval} for --disable-stl]) ;; esac],[tyx_use_stl=true]) AM_CONDITIONAL([TINYXML_USE_STL], [test x$tyx_use_stl = xtrue]) case $tyx_use_stl in true) TIXML_USE_STL=use_stl_def ;; *) TIXML_USE_STL=/dev/null ;; esac AC_SUBST_FILE(TIXML_USE_STL) AC_CONFIG_FILES([Makefile docs/Makefile tinyxml.h]) AC_OUTPUT ++++++ tinyxml-c_headers.patch ++++++ Use the C++ versions of the STDC headers. signed-of-by: pth@suse.de Index: tinystr.h =================================================================== --- tinystr.h.orig 2010-03-23 06:16:36.000000000 +0100 +++ tinystr.h 2010-11-04 15:20:38.861503854 +0100 @@ -39,8 +39,8 @@ distribution. #ifndef TIXML_STRING_INCLUDED #define TIXML_STRING_INCLUDED -#include <assert.h> -#include <string.h> +#include <cassert> +#include <cstring> /* The support for explicit isn't that universal, and it isn't really required - it is used to check that the TiXmlString class isn't incorrectly Index: tinyxml.cpp =================================================================== --- tinyxml.cpp.orig 2010-03-23 06:16:36.000000000 +0100 +++ tinyxml.cpp 2010-11-04 15:22:13.806257421 +0100 @@ -22,7 +22,7 @@ must not be misrepresented as being the distribution. */ -#include <ctype.h> +#include <cctype> #ifdef TIXML_USE_STL #include <sstream> Index: tinyxml.h =================================================================== --- tinyxml.h.orig 2010-03-23 06:16:36.000000000 +0100 +++ tinyxml.h 2010-11-04 15:21:12.619460632 +0100 @@ -32,11 +32,11 @@ distribution. #pragma warning( disable : 4786 ) #endif -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <assert.h> +#include <cctype> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <cassert> // Help out windows: #if defined( _DEBUG ) && !defined( DEBUG ) Index: tinyxmlparser.cpp =================================================================== --- tinyxmlparser.cpp.orig 2010-03-23 06:16:36.000000000 +0100 +++ tinyxmlparser.cpp 2010-11-04 15:23:03.795078300 +0100 @@ -22,8 +22,8 @@ must not be misrepresented as being the distribution. */ -#include <ctype.h> -#include <stddef.h> +#include <cctype> +#include <cstddef> #include "tinyxml.h" Index: xmltest.cpp =================================================================== --- xmltest.cpp.orig 2010-03-23 06:16:36.000000000 +0100 +++ xmltest.cpp 2010-11-04 15:23:38.429189753 +0100 @@ -8,7 +8,7 @@ #include <sstream> using namespace std; #else - #include <stdio.h> + #include <cstdio> #endif #if defined( WIN32 ) && defined( TUNE ) ++++++ tinyxml-entity.patch ++++++ ? entity.patch Index: tinyxml.cpp =================================================================== --- tinyxml.cpp.orig 2010-11-04 15:33:06.473418438 +0100 +++ tinyxml.cpp 2010-11-04 15:33:06.597440320 +0100 @@ -57,30 +57,7 @@ void TiXmlBase::EncodeString( const TIXM { unsigned char c = (unsigned char) str[i]; - if ( c == '&' - && i < ( (int)str.length() - 2 ) - && str[i+1] == '#' - && str[i+2] == 'x' ) - { - // Hexadecimal character reference. - // Pass through unchanged. - // © -- copyright symbol, for example. - // - // The -1 is a bug fix from Rob Laveaux. It keeps - // an overflow from happening if there is no ';'. - // There are actually 2 ways to exit this loop - - // while fails (error case) and break (semicolon found). - // However, there is no mechanism (currently) for - // this function to return an error. - while ( i<(int)str.length()-1 ) - { - outString->append( str.c_str() + i, 1 ); - ++i; - if ( str[i] == ';' ) - break; - } - } - else if ( c == '&' ) + if ( c == '&' ) { outString->append( entity[0].str, entity[0].strLength ); ++i; Index: xmltest.cpp =================================================================== --- xmltest.cpp.orig 2010-11-04 15:33:06.553432556 +0100 +++ xmltest.cpp 2010-11-04 15:33:06.597440320 +0100 @@ -1338,6 +1338,16 @@ int main() }*/ } + #ifdef TIXML_USE_STL + { + TiXmlDocument xml; + xml.Parse("<foo>foo&#xa+bar</foo>"); + std::string str; + str << xml; + XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>", str.c_str() ); + } + #endif + /* 1417717 experiment { TiXmlDocument xml; ++++++ tinyxml.h.in ++++++ ++++ 1801 lines (skipped) ++++++ use_stl_def ++++++ #ifdef TIXML_USE_STL #undef TIXML_USE_STL #endif #define TIXML_USE_STL 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org