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/25] 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 74ceacba8002354ad5cf6151f3b8e8f8b6ea3857 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 4 Feb 2006 19:58:39 +0000 Subject: [PATCH 02/25] 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..8749345 --- /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: xmldiff-0.6.7-x64safe.patch,v 1.1 2006/02/04 19:58:39 pfrields 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 03/25] 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 039562b86695c1b3e2cd90da7167d289da529ef1 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 18 Feb 2006 03:41:11 +0000 Subject: [PATCH 04/25] 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 05/25] 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 87e9e60cf932cc03b855f29f0b7412b8df6e5d83 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 06/25] 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 07/25] 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 22922f7f5b8568ab53b08821a5063ad353f52dd4 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 2 Sep 2006 17:39:22 +0000 Subject: [PATCH 08/25] 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 09/25] 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 71258574b08a6aad57382ae364fa56d33cc32443 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sat, 2 Sep 2006 18:37:58 +0000 Subject: [PATCH 10/25] 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 11/25] 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 8cdc6ee0ae96ea942110ca2fee9a99d2aae04445 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Thu, 7 Sep 2006 02:06:36 +0000 Subject: [PATCH 12/25] 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 13/25] 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 c01497d2d97c86a73349fa49ba18a33b2609f584 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:14:00 +0000 Subject: [PATCH 14/25] 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 8749345..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: xmldiff-0.6.7-x64safe.patch,v 1.1 2006/02/04 19:58:39 pfrields 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..483dd58 --- /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:14:00 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:14:00 pfrields Exp $" + +-from __future__ import nested_scopes + from os.path import join, basename + from cStringIO import StringIO + import sys From d481cc82c7cca43b5b2ab287d35485623c2ae97a Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:14:15 +0000 Subject: [PATCH 15/25] 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 60559cc475c6f794f65e01bad4bd2e367b85b295 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:15:07 +0000 Subject: [PATCH 16/25] 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 17/25] 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 aad63935fd153eec2695de12f80db2489cc7323f Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:17:47 +0000 Subject: [PATCH 18/25] 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 3fa6364714f7fdfda6177fb99ff161dba1b28cbb Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 17 Dec 2006 22:18:23 +0000 Subject: [PATCH 19/25] 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 121a911f186a0f02df821fb7113c2078e5eef6c5 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Sun, 21 Jan 2007 16:30:30 +0000 Subject: [PATCH 20/25] Fix dep_whiteout problem in Rawhide/FC7 --- xmldiff.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xmldiff.spec b/xmldiff.spec index 2934d67..214e21e 100644 --- a/xmldiff.spec +++ b/xmldiff.spec @@ -1,8 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +# Try to cope with dependency whiteout necessity "ncurses>bash" +%if "%{fedora}" == "7" +%define new_dep_whiteout %(echo "%{_dependency_whiteout}" | %{__sed} "s@libtermcap>bash@libtermcap>bash\\\n\\\tncurses>bash@") +%define _dependency_whiteout "%{new_dep_whiteout}" +%endif + Name: xmldiff Version: 0.6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tree to tree correction between XML documents Group: Applications/Text @@ -80,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 21 2007 Paul W. Frields - 0.6.8-2 +- Fix dep_whiteout problem in Rawhide + * Fri Dec 15 2006 Paul W. Frields - 0.6.8-1 - New upstream 0.6.8 - Slight spec file cleaning From 46a2fe5b286eba13198d0e688f812876c4ae0ae4 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 6 Apr 2007 02:41:12 +0000 Subject: [PATCH 21/25] Retired this package due to consistent build problems on multiple arches and unresponsive upstream --- GPL | 339 -------------------------------- Makefile | 21 -- dead.package | 0 sources | 1 - xmldiff-0.6.7-clean-tmp.patch | 18 -- xmldiff-0.6.7-xsldata.patch | 24 --- xmldiff-0.6.8-importorder.patch | 28 --- xmldiff.spec | 138 ------------- 8 files changed, 569 deletions(-) delete mode 100644 GPL delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmldiff-0.6.7-clean-tmp.patch delete mode 100644 xmldiff-0.6.7-xsldata.patch delete mode 100644 xmldiff-0.6.8-importorder.patch delete mode 100644 xmldiff.spec diff --git a/GPL b/GPL deleted file mode 100644 index a43ea21..0000000 --- a/GPL +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/Makefile b/Makefile deleted file mode 100644 index 94f0700..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmldiff -# $Id$ -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 -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/dead.package b/dead.package new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources deleted file mode 100644 index 67b5501..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bc1e184e45ce7f9c6beedda76fbeaa16 xmldiff-0.6.8.tar.gz diff --git a/xmldiff-0.6.7-clean-tmp.patch b/xmldiff-0.6.7-clean-tmp.patch deleted file mode 100644 index 27e2095..0000000 --- a/xmldiff-0.6.7-clean-tmp.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev ---- xmldiff-0.6.7-original/bin/xmlrev 2006-01-24 22:10:13.000000000 -0800 -+++ xmldiff-0.6.7/bin/xmlrev 2006-01-24 22:11:17.000000000 -0800 -@@ -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 diff --git a/xmldiff-0.6.7-xsldata.patch b/xmldiff-0.6.7-xsldata.patch deleted file mode 100644 index 2c6f3b5..0000000 --- a/xmldiff-0.6.7-xsldata.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr xmldiff-0.6.7-original/__pkginfo__.py xmldiff-0.6.7/__pkginfo__.py ---- xmldiff-0.6.7-original/__pkginfo__.py 2005-05-03 11:42:29.000000000 -0400 -+++ xmldiff-0.6.7/__pkginfo__.py 2006-01-10 21:21:30.000000000 -0500 -@@ -54,7 +54,7 @@ - except: - pass - --data_files = [("share/sgml/stylesheet/xmldiff", -+data_files = [("share/xml/xmldiff", - ['xsl/docbook_rev.xsl', 'xsl/xmlrev.xslt']) - ] - -diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev ---- xmldiff-0.6.7-original/bin/xmlrev 2005-05-03 11:42:29.000000000 -0400 -+++ xmldiff-0.6.7/bin/xmlrev 2006-01-10 21:21:30.000000000 -0500 -@@ -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) diff --git a/xmldiff-0.6.8-importorder.patch b/xmldiff-0.6.8-importorder.patch deleted file mode 100644 index 483dd58..0000000 --- a/xmldiff-0.6.8-importorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -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:14:00 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:14:00 pfrields Exp $" - --from __future__ import nested_scopes - from os.path import join, basename - from cStringIO import StringIO - import sys diff --git a/xmldiff.spec b/xmldiff.spec deleted file mode 100644 index 214e21e..0000000 --- a/xmldiff.spec +++ /dev/null @@ -1,138 +0,0 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# Try to cope with dependency whiteout necessity "ncurses>bash" -%if "%{fedora}" == "7" -%define new_dep_whiteout %(echo "%{_dependency_whiteout}" | %{__sed} "s@libtermcap>bash@libtermcap>bash\\\n\\\tncurses>bash@") -%define _dependency_whiteout "%{new_dep_whiteout}" -%endif - -Name: xmldiff -Version: 0.6.8 -Release: 2%{?dist} -Summary: Tree to tree correction between XML documents - -Group: Applications/Text -License: GPL -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 -Source1: GPL -Patch0: xmldiff-0.6.7-xsldata.patch -Patch1: xmldiff-0.6.7-clean-tmp.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: docbook-style-xsl -Requires: file -Requires: /usr/bin/sgmlnorm -Requires: /usr/bin/xsltproc - - -%description -The xmldiff utility extracts differences between two XML files. It -returns a set of primitives to apply on source tree to obtain the -destination tree. 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). - - -%prep -%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" -done -install -pm 644 %{SOURCE1} COPYING - - -%build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build - - -%install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -# strip tests -rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/test -mkdir -p ${RPM_BUILD_ROOT}{%{_mandir}/man1,%{_docdir}/%{name}-%{version}} -install -m 644 man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 -# quiet rpmlint -chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/main.py - - -%check -cd test -PYTHONPATH=$(ls -1d ${PWD}/../build/lib.*) %{__python} runtests.py - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc COPYING README README.xmlrev doc/*.html doc/*.txt -%{_datadir}/xml/xmldiff/ -%{python_sitearch}/xmldiff/ -%{_bindir}/xmldiff -%{_bindir}/xmlrev -%{_mandir}/man1/* - - -%changelog -* Sun Jan 21 2007 Paul W. Frields - 0.6.8-2 -- Fix dep_whiteout problem in Rawhide - -* 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 - -* 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 - -* 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 - -* Sat Jan 28 2006 Paul W. Frields - 0.6.7-7 -- ExcludeArch: x86_64 (#177083) - -* Tue Jan 24 2006 Paul W. Frields - 0.6.7-6 -- Prevent temp file logjam (#177800) - -* Thu Jan 12 2006 Paul W. Frields - 0.6.7-5 -- Add Requires: file -- xmlrev: use proper XSL location - -* Tue Jan 10 2006 Paul W. Frields - 0.6.7-4 -- Convert additional files to UTF-8 -- Include documentation properly -- Reseat XSL files - -* Sun Jan 8 2006 Paul W. Frields - 0.6.7-3 -- Convert manpages in %%prep -- Enable tests in %%check -- Make BuildRequires more robust - -* Fri Jan 6 2006 Paul W. Frields - 0.6.7-2 -- Fix Requires -- Drop test suite due to external dependencies -- convert man pages to UTF-8 - -* Thu Jan 5 2006 Paul W. Frields - 0.6.7-1 -- Initial RPM version - From 579eeb1ece6d07214d2dfa215965e0fbd758e2f1 Mon Sep 17 00:00:00 2001 From: "Paul W. Frields" Date: Fri, 24 Aug 2007 15:50:49 +0000 Subject: [PATCH 22/25] 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 23/25] 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 7cd84df8ce3f81b5359476f51278d1ca51221ff6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:10 +0000 Subject: [PATCH 24/25] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore From 7fe3bcbd88d6428472d3b423c103dadb2e79ecdd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:56:12 +0000 Subject: [PATCH 25/25] 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