From 687e76a8d4723ca101349a4ad17e7a798c2342a8 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 4 Feb 2006 19:58:39 +0000 Subject: [PATCH 01/13] Include x86_64 patch and remove ExcludeArch (thanks Ville Skytta); 0.6.7-9 --- xmldiff-0.6.7-x64safe.patch | 32 ++++++++++++++++++++++++++++++++ xmldiff.spec | 9 ++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 xmldiff-0.6.7-x64safe.patch diff --git a/xmldiff-0.6.7-x64safe.patch b/xmldiff-0.6.7-x64safe.patch new file mode 100644 index 0000000..9fb341f --- /dev/null +++ b/xmldiff-0.6.7-x64safe.patch @@ -0,0 +1,32 @@ +diff -Nru xmldiff-0.6.7-orig/extensions/maplookup.c xmldiff-0.6.7/extensions/maplookup.c +--- xmldiff-0.6.7-orig/extensions/maplookup.c 2005-05-03 17:28:45.000000000 +0200 ++++ xmldiff-0.6.7/extensions/maplookup.c 2005-06-24 18:08:39.327922316 +0200 +@@ -1,5 +1,6 @@ + #include + #include ++#include + + 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 ; diff --git a/xmldiff.spec b/xmldiff.spec index f3ad524..3f99bcb 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -13,6 +13,7 @@ Source0: ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz Source1: GPL Patch0: xmldiff-0.6.7-xsldata.patch Patch1: xmldiff-0.6.7-clean-tmp.patch +Patch2: xmldiff-0.6.7-x64safe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python @@ -24,8 +25,6 @@ Requires: file Requires: /usr/bin/sgmlnorm Requires: /usr/bin/xsltproc -# see bug #177083 -ExcludeArch: x86_64 %description The xmldiff utility extracts differences between two XML files. It @@ -39,6 +38,7 @@ H. Garcia-Molina and J. Widom (Stanford University, 1996). %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 for i in man/*.1 __pkginfo__.py doc/*.txt do iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i" @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 4 2006 Paul W. Frields - 0.6.7-9 +- Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta) + * Sat Jan 28 2006 Paul W. Frields - 0.6.7-8 - ExcludeArch includes spurious values from misplaced comment From 6d5aab4055f852259cd6d3b5cead248b620b5e9e Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 18 Feb 2006 03:41:11 +0000 Subject: [PATCH 02/13] FESCo mandated rebuild, push 0.6.7-10 --- xmldiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmldiff.spec b/xmldiff.spec index 3f99bcb..abcc190 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 17 2006 Paul W. Frields - 0.6.7-10 +- FESCo mandated rebuild + * Sat Feb 4 2006 Paul W. Frields - 0.6.7-9 - Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta) From 707e4680d014fdd4913f8f528ec014b68c16e40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:17:41 +0000 Subject: [PATCH 03/13] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 06f63511ceb8e9b433aa018280bae376ab840621 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 2 Sep 2006 17:39:22 +0000 Subject: [PATCH 04/13] Bump release for FC6 mass rebuild --- xmldiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmldiff.spec b/xmldiff.spec index abcc190..0417681 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Sep 2 2006 Paul W. Frields - 0.6.7-11 +- Bump release for FC6 mass rebuild + * Fri Feb 17 2006 Paul W. Frields - 0.6.7-10 - FESCo mandated rebuild From d5db9cae010ec2c6c822439dbc1945f50574ce6b Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 2 Sep 2006 18:37:58 +0000 Subject: [PATCH 05/13] Rebuild success, job 15866 --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 7582057a3db2b671a7794770a7557875fdf7fa69 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Thu, 7 Sep 2006 02:06:36 +0000 Subject: [PATCH 06/13] Unghost pyo file --- xmldiff.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmldiff.spec b/xmldiff.spec index 0417681..7ed8357 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -2,7 +2,7 @@ Name: xmldiff Version: 0.6.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -82,10 +82,13 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/xmldiff/*.so %{_datadir}/xml/xmldiff/* %{_mandir}/man1/* -%ghost %{python_sitearch}/xmldiff/*.pyo +%{python_sitearch}/xmldiff/*.pyo %changelog +* Wed Sep 6 2006 Paul W. Frields - 0.6.7-12 +- Unghost pyo file + * Sat Sep 2 2006 Paul W. Frields - 0.6.7-11 - Bump release for FC6 mass rebuild From 9542b93719029f58e52edca178f9f6d96ecf7255 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:41:35 +0000 Subject: [PATCH 07/13] Initialize branch FC-6 for xmldiff --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 60559cc475c6f794f65e01bad4bd2e367b85b295 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:15:07 +0000 Subject: [PATCH 08/13] Remove obsolete patch and add new one to prepare for 0.6.8 push --- xmldiff-0.6.7-x64safe.patch | 32 -------------------------------- xmldiff-0.6.8-importorder.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 xmldiff-0.6.7-x64safe.patch create mode 100644 xmldiff-0.6.8-importorder.patch diff --git a/xmldiff-0.6.7-x64safe.patch b/xmldiff-0.6.7-x64safe.patch deleted file mode 100644 index 9fb341f..0000000 --- a/xmldiff-0.6.7-x64safe.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nru xmldiff-0.6.7-orig/extensions/maplookup.c xmldiff-0.6.7/extensions/maplookup.c ---- xmldiff-0.6.7-orig/extensions/maplookup.c 2005-05-03 17:28:45.000000000 +0200 -+++ xmldiff-0.6.7/extensions/maplookup.c 2005-06-24 18:08:39.327922316 +0200 -@@ -1,5 +1,6 @@ - #include - #include -+#include - - 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 ; diff --git a/xmldiff-0.6.8-importorder.patch b/xmldiff-0.6.8-importorder.patch new file mode 100644 index 0000000..a5a68ec --- /dev/null +++ b/xmldiff-0.6.8-importorder.patch @@ -0,0 +1,28 @@ +diff -uNr xmldiff-0.6.8-original/setup.py xmldiff-0.6.8/setup.py +--- xmldiff-0.6.8-original/setup.py 2006-12-15 20:20:59.000000000 -0500 ++++ xmldiff-0.6.8/setup.py 2006-12-15 20:21:15.000000000 -0500 +@@ -18,9 +18,9 @@ + # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + """ Generic Setup script, takes package info from __pkginfo__.py file """ + ++from __future__ import nested_scopes + __revision__ = '$Id: xmldiff-0.6.8-importorder.patch,v 1.1 2006/12/17 22:15:07 pfrields Exp $' + +-from __future__ import nested_scopes + import os + import sys + import shutil +diff -uNr xmldiff-0.6.8-original/test/regrtest.py xmldiff-0.6.8/test/regrtest.py +--- xmldiff-0.6.8-original/test/regrtest.py 2006-12-15 20:20:59.000000000 -0500 ++++ xmldiff-0.6.8/test/regrtest.py 2006-12-15 20:35:30.000000000 -0500 +@@ -1,9 +1,9 @@ + """ + xmldiff non regression test + """ ++from __future__ import nested_scopes + __revision__ = "$Id: xmldiff-0.6.8-importorder.patch,v 1.1 2006/12/17 22:15:07 pfrields Exp $" + +-from __future__ import nested_scopes + from os.path import join, basename + from cStringIO import StringIO + import sys From d5d1d5a653a8966b2384fcb95bde3930114c8d8f Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:15:15 +0000 Subject: [PATCH 09/13] Update to new upstream 0.6.8 --- xmldiff.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/xmldiff.spec b/xmldiff.spec index 7ed8357..2934d67 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -1,8 +1,8 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: xmldiff -Version: 0.6.7 -Release: 12%{?dist} +Version: 0.6.8 +Release: 1%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -13,13 +13,12 @@ Source0: ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz Source1: GPL Patch0: xmldiff-0.6.7-xsldata.patch Patch1: xmldiff-0.6.7-clean-tmp.patch -Patch2: xmldiff-0.6.7-x64safe.patch +Patch2: xmldiff-0.6.8-importorder.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python BuildRequires: python-devel BuildRequires: python-logilab-common -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: docbook-style-xsl Requires: file Requires: /usr/bin/sgmlnorm @@ -73,19 +72,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README README.xmlrev doc/*.html doc/*.txt -%dir %{_datadir}/xml/xmldiff -%dir %{python_sitearch}/xmldiff +%{_datadir}/xml/xmldiff/ +%{python_sitearch}/xmldiff/ %{_bindir}/xmldiff %{_bindir}/xmlrev -%{python_sitearch}/xmldiff/*.py -%{python_sitearch}/xmldiff/*.pyc -%{python_sitearch}/xmldiff/*.so -%{_datadir}/xml/xmldiff/* %{_mandir}/man1/* -%{python_sitearch}/xmldiff/*.pyo %changelog +* Fri Dec 15 2006 Paul W. Frields - 0.6.8-1 +- New upstream 0.6.8 +- Slight spec file cleaning + * Wed Sep 6 2006 Paul W. Frields - 0.6.7-12 - Unghost pyo file From 3fa6364714f7fdfda6177fb99ff161dba1b28cbb Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:18:23 +0000 Subject: [PATCH 10/13] Update sources and .cvsignore for 0.6.8 push --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 11807dc..d5b6705 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmldiff-0.6.7.tar.gz +xmldiff-0.6.8.tar.gz diff --git a/sources b/sources index a5da2e3..67b5501 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07b97c97a0b83d605f37c712400e24ff xmldiff-0.6.7.tar.gz +bc1e184e45ce7f9c6beedda76fbeaa16 xmldiff-0.6.8.tar.gz From 579eeb1ece6d07214d2dfa215965e0fbd758e2f1 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 24 Aug 2007 15:50:49 +0000 Subject: [PATCH 11/13] Update License tags to meet guidelines --- xmldiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmldiff.spec b/xmldiff.spec index 2934d67..7159101 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -6,7 +6,7 @@ Release: 1%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text -License: GPL +License: GPLv2+ URL: http://www.logilab.org/projects/xmldiff Source0: ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz # No license in original tarball, but referenced in docs From 581fa28db5f2bad2e6f8364fec4c33548bdb2b32 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:15 +0000 Subject: [PATCH 12/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 94f0700..f72f4d9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmldiff -# $Id$ +# $Id: Makefile,v 1.1 2006/01/11 22:56:40 pfrields Exp $ NAME := xmldiff SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7fe3bcbd88d6428472d3b423c103dadb2e79ecdd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:12 +0000 Subject: [PATCH 13/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f72f4d9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmldiff -# $Id: Makefile,v 1.1 2006/01/11 22:56:40 pfrields Exp $ -NAME := xmldiff -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6