Hello community, here is the log from the commit of package python-xmldiff checked in at Sat Jun 3 00:59:20 CEST 2006. -------- --- python-xmldiff/python-xmldiff.changes 2006-02-28 16:46:04.000000000 +0100 +++ python-xmldiff/python-xmldiff.changes 2006-06-02 22:44:28.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 2 22:43:24 CEST 2006 - cthiel@suse.de + +- specfile cleanup, added Requires +- imported 3 patches from Fedora + +------------------------------------------------------------------- New: ---- xmldiff-0.6.7-clean-tmp.patch xmldiff-0.6.7-x64safe.patch xmldiff-0.6.7-xsldata.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-xmldiff.spec ++++++ --- /var/tmp/diff_new_pack.BGWB4i/_old 2006-06-03 00:59:09.000000000 +0200 +++ /var/tmp/diff_new_pack.BGWB4i/_new 2006-06-03 00:59:09.000000000 +0200 @@ -11,18 +11,21 @@ # norootforbuild Name: python-xmldiff -BuildRequires: python-devel pyxml +BuildRequires: python-devel Summary: Python Tool for Detecting Differences between XML Files -License: LGPL +License: GPL Version: 0.6.7 -Release: 5 -Group: Development/Libraries/Python +Release: 14 +Group: Productivity/Publishing/XML Source: ftp://ftp.logilab.org/pub/xmldiff/xmldiff-%{version}.tar.gz -# Patch: xmldiff-0.6.4-tmp.diff -%define pyver %(python -c 'import sys; print sys.version[:3]') -Requires: python >= %pyver, python < %pyver.99 +Patch: xmldiff-0.6.7-clean-tmp.patch +Patch1: xmldiff-0.6.7-x64safe.patch +Patch2: xmldiff-0.6.7-xsldata.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.logilab.org/projects/xmldiff/ +Requires: file opensp libxslt python-xml + +%py_requires %description XMLdiff shows the differences between two similar XML files in the same @@ -30,6 +33,10 @@ or as a command line tool. It can work either with XML files or DOM trees. +The implementation is based on "Change detection in hierarchically +structured information", by S. Chawathe, A. Rajaraman, H. Garcia-Molina +and J. Widom, Stanford University, 1996 + Authors: @@ -38,27 +45,31 @@ %prep %setup -q -n xmldiff-%{version} -# %patch -P 0 -p 1 +%patch +%patch1 +%patch2 %build export CFLAGS="$RPM_OPT_FLAGS" python setup.py build %install -rm -rf $RPM_BUILD_ROOT -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES -# files already part of the file system package -sed -i 's:%dir /usr/share/sgml$::' INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT -%files -f INSTALLED_FILES +%files %defattr(-, root, root) -%doc README* TODO -%{_libdir}/python%{pyver}/site-packages/xmldiff/test/data +%doc ChangeLog TODO README* doc/ +%{py_sitedir}/xmldiff +%{_bindir}/* +%{_datadir}/xml %changelog -n python-xmldiff +* Fri Jun 02 2006 - cthiel@suse.de +- specfile cleanup, added Requires +- imported 3 patches from Fedora * Tue Feb 28 2006 - jmatejek@suse.cz - updated to reflect python changes due to #149809 * Wed Jan 25 2006 - mls@suse.de ++++++ xmldiff-0.6.7-clean-tmp.patch ++++++ --- bin/xmlrev +++ bin/xmlrev @@ -10,7 +10,7 @@ TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT" - +trap "rm -f $TMPFILES" exit function guess_doc_type() { # $1 filepath @@ -124,5 +124,3 @@ revision "$1" "$2" ;; esac - -rm -f $TMPFILES ++++++ xmldiff-0.6.7-x64safe.patch ++++++ --- extensions/maplookup.c +++ extensions/maplookup.c @@ -1,5 +1,6 @@ #include <Python.h> #include <stdio.h> +#include <inttypes.h> char * __revision__ = "$Id: maplookup.c,v 1.9 2005/04/30 11:59:47 ludal Exp $"; @@ -156,11 +157,19 @@ { PyObject *key ; couple = PyList_GET_ITEM(_mapping, i) ; - key = Py_BuildValue("(i,i)", (int)node1, (int)PyTuple_GET_ITEM(couple, 0)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node1, (size_t)PyTuple_GET_ITEM(couple, 0)) ; +#endif if (PyDict_GetItem(_dict1, key) != NULL) { Py_DECREF(key) ; - key = Py_BuildValue("(i,i)", (int)node2, (int)PyTuple_GET_ITEM(couple, 1)) ; +#if __WORDSIZE == 64 + key = Py_BuildValue("(l,l)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#else + key = Py_BuildValue("(i,i)", (size_t)node2, (size_t)PyTuple_GET_ITEM(couple, 1)) ; +#endif if (PyDict_GetItem(_dict2, key) != NULL) { seq_num += 1 ; ++++++ xmldiff-0.6.7-xsldata.patch ++++++ --- __pkginfo__.py +++ __pkginfo__.py @@ -54,7 +54,7 @@ except: pass -data_files = [("share/sgml/stylesheet/xmldiff", +data_files = [("share/xml/xmldiff", ['xsl/docbook_rev.xsl', 'xsl/xmlrev.xslt']) ] --- bin/xmlrev +++ bin/xmlrev @@ -107,7 +107,7 @@ echo " show difference between revisions as xupdate" } -ML_DIR=/usr/share/sgml/stylesheet/xmldiff +ML_DIR=/usr/share/xml/xmldiff case "$1" in --help) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org