diff --git a/.cvsignore b/.cvsignore index 101f5cf..69a64ba 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libxml2-2.6.10.tar.gz +libxml2-2.6.11.tar.gz diff --git a/libxml2.spec b/libxml2.spec index 8ec7a7e..152c3f0 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 -Version: 2.6.10 -Release: 2 +Version: 2.6.11 +Release: 1 License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz @@ -60,8 +60,46 @@ at parse time or later once the document has been modified. %setup -q %build -%configure -make +# +# try to use compiler profiling, based on Arjan van de Ven +# initial test spec. This really doesn't work okay for most tests done. +# +GCC_VERSION=`gcc --version | grep "^gcc" | awk '{ print $3 }' | sed 's+\([0-9]\)\.\([0-9]\)\..*+\1\2+'` +#if [ $GCC_VERSION -eq 32 ] +#then +# PROF_GEN='-fprofile-arcs' +# PROF_USE='-fbranch-probabilities' +#else if [ $GCC_VERSION -eq 33 ] +#then +# PROF_GEN='-fprofile-arcs' +# PROF_USE='-fbranch-probabilities -ftracer' +#else +if [ $GCC_VERSION -ge 34 ] +then + PROF_GEN='-fprofile-generate' + PROF_USE='-fprofile-use' +fi +#fi +#fi + +if [ "$PROF_GEN" != "" ] +then + # First generate a profiling version + CFLAGS="${RPM_OPT_FLAGS} ${PROF_GEN}" %configure + make + # Run a few sampling + make dba100000.xml + ./xmllint --noout dba100000.xml + ./xmllint --stream dba100000.xml + ./xmllint --noout --valid test/valid/REC-xml-19980210.xml + ./xmllint --stream --valid test/valid/REC-xml-19980210.xml + # Then generate code based on profile + CFLAGS="${RPM_OPT_FLAGS} ${PROF_USE}" %configure + make +else + %configure + make +fi (cd doc/examples ; make clean) gzip -9 ChangeLog @@ -121,11 +159,8 @@ rm -fr %{buildroot} %doc doc/python.html %changelog -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon May 17 2004 Daniel Veillard -- upstream release 2.6.10 see http://xmlsoft.org/news.html +* Mon Jul 5 2004 Daniel Veillard +- upstream release 2.6.11 see http://xmlsoft.org/news.html * Thu Jan 2 2003 Daniel Veillard - integrated drv_libxml2 xml.sax driver from Stéphane Bidoul diff --git a/sources b/sources index 0ae80be..4fb29be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -299da4545913212ec4d82429d74314b9 libxml2-2.6.10.tar.gz +c391173a26ec7c2ac702b54d06420fdb libxml2-2.6.11.tar.gz