From 7f460da1339ae5f4583c720999b1dcd26ba55882 Mon Sep 17 00:00:00 2001
From: konradm <konradm@fedoraproject.org>
Date: Mon, 27 Apr 2009 02:32:51 +0000
Subject: [PATCH 01/45] Import.

---
 .cvsignore               |  1 +
 import.log               |  1 +
 python-zope-testing.spec | 52 ++++++++++++++++++++++++++++++++++++++++
 sources                  |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 import.log
 create mode 100644 python-zope-testing.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..a1c11db 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+zope.testing-3.7.3.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..b84bfdc
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+python-zope-testing-3_7_3-1_fc10:HEAD:python-zope-testing-3.7.3-1.fc10.src.rpm:1240799558
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
new file mode 100644
index 0000000..13f35fa
--- /dev/null
+++ b/python-zope-testing.spec
@@ -0,0 +1,52 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name:           python-zope-testing
+Version:        3.7.3
+Release:        1%{?dist}
+Summary:        Zope Testing Framework
+Group:          Development/Languages
+License:        ZPLv2.1
+URL:            http://pypi.python.org/pypi/zope.testing
+Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testing-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+BuildRequires:  python-devel
+Requires:       python-zope-filesystem
+
+
+%description
+This package provides a number of testing frameworks. It includes a
+flexible test runner, and supports both doctest and unittest.
+
+
+%prep
+%setup -q -n zope.testing-%{version}
+
+
+%build
+%{__python} setup.py build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+ 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc documentation.txt CHANGES.txt README.txt
+%{python_sitelib}/zope/*
+%{python_sitelib}/zope.testing*
+
+
+%changelog
+* Wed Apr 22 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-1
+- Bump to 3.7.3.
+
+* Sun Dec 14 2008 Conrad Meyer <konrad@tylerc.org> - 3.7.1-1
+- Initial package.
diff --git a/sources b/sources
index e69de29..37443c0 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+5b4beacff550fb306fb49500679080cf  zope.testing-3.7.3.tar.gz

From 16cb01b3f93ffaebfb70bb7dd41eca9fe5af7e26 Mon Sep 17 00:00:00 2001
From: konradm <konradm@fedoraproject.org>
Date: Sat, 13 Jun 2009 08:01:49 +0000
Subject: [PATCH 02/45] - Fix file conflict with python-zope-filesystem.

---
 python-zope-testing.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 13f35fa..87ee08c 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -2,7 +2,7 @@
 
 Name:           python-zope-testing
 Version:        3.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -32,6 +32,9 @@ flexible test runner, and supports both doctest and unittest.
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+# Use the __init__.py from python-zope-filesystem instead.
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py
+
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 13 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-2
+- Fix file conflict with python-zope-filesystem.
+
 * Wed Apr 22 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-1
 - Bump to 3.7.3.
 

From b4fb1466cae6834c269b9fa00418cf6ee61ae26f Mon Sep 17 00:00:00 2001
From: konradm <konradm@fedoraproject.org>
Date: Mon, 15 Jun 2009 18:21:35 +0000
Subject: [PATCH 03/45] - Actually fix file conflict with
 python-zope-filesystem.

---
 python-zope-testing.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 87ee08c..46b27d3 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -2,7 +2,7 @@
 
 Name:           python-zope-testing
 Version:        3.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -33,7 +33,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 # Use the __init__.py from python-zope-filesystem instead.
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
  
 %clean
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 15 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-3
+- Actually fix file conflict with python-zope-filesystem.
+
 * Sat Jun 13 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-2
 - Fix file conflict with python-zope-filesystem.
 

From cdc7a05bc851a3caba1afa73813e7961d7f8bbcb Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Mon, 27 Jul 2009 01:35:36 +0000
Subject: [PATCH 04/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 46b27d3..9544ed5 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -2,7 +2,7 @@
 
 Name:           python-zope-testing
 Version:        3.7.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 15 2009 Conrad Meyer <konrad@tylerc.org> - 3.7.3-3
 - Actually fix file conflict with python-zope-filesystem.
 

From a0e0d4047b70b7d9054c9ccb3db1aeb5ccc69caa Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:32:04 +0000
Subject: [PATCH 05/45] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d2b23bc..aba3baa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := python-zope-testing
 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 cfc4b47f2267f1d2bae59412d1682d2ae3aeeb41 Mon Sep 17 00:00:00 2001
From: cheeselee <cheeselee@fedoraproject.org>
Date: Wed, 16 Jun 2010 19:14:28 +0000
Subject: [PATCH 06/45] - Update to 3.9.5 - Rearrange documents - Requires:
 python-zope-interface and python-zope-exceptions added

---
 .cvsignore               |  2 +-
 python-zope-testing.spec | 28 +++++++++++++++++++++++-----
 sources                  |  2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a1c11db..f957636 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zope.testing-3.7.3.tar.gz
+zope.testing-3.9.5.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 9544ed5..01a3a0c 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,8 +1,10 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
 Name:           python-zope-testing
-Version:        3.7.3
-Release:        4%{?dist}
+Version:        3.9.5
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -13,6 +15,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
 Requires:       python-zope-filesystem
+Requires:       python-zope-exceptions
+Requires:       python-zope-interface
 
 
 %description
@@ -35,6 +39,15 @@ rm -rf $RPM_BUILD_ROOT
 # Use the __init__.py from python-zope-filesystem instead.
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
+# Deal with documents
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/testing/*.txt
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/zope/testing/testrunner/*.txt
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/testrunner/
+cp -p src/zope/testing/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+cp -p src/zope/testing/testrunner/*.txt \
+   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/testrunner/
+cp -p COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt \
+   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -42,12 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc documentation.txt CHANGES.txt README.txt
-%{python_sitelib}/zope/*
+%{_docdir}/%{name}-%{version}/
+%{python_sitelib}/zope/testing/
 %{python_sitelib}/zope.testing*
 
 
 %changelog
+* Thu Jun 17 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.5-1
+- Update to 3.9.5
+- Rearrange documents
+- Requires: python-zope-interface and python-zope-exceptions added
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 37443c0..80871d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b4beacff550fb306fb49500679080cf  zope.testing-3.7.3.tar.gz
+39092299d71c5dea5378c912df4cc84c  zope.testing-3.9.5.tar.gz

From eb45277a6d2eb3981ae38b1901d9d36465ec61f5 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Thu, 22 Jul 2010 06:02:12 +0000
Subject: [PATCH 07/45] - Rebuilt for    
 https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 01a3a0c..ddda84a 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -4,7 +4,7 @@
 
 Name:           python-zope-testing
 Version:        3.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Thu Jun 17 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.5-1
 - Update to 3.9.5
 - Rearrange documents

From 525d4f9cde60d1f6685d63ea4347e83e28b6db83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 10:53:48 +0000
Subject: [PATCH 08/45] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 import.log               |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 import.log

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 aba3baa..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-zope-testing
-# $Id$
-NAME := python-zope-testing
-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/import.log b/import.log
deleted file mode 100644
index b84bfdc..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-python-zope-testing-3_7_3-1_fc10:HEAD:python-zope-testing-3.7.3-1.fc10.src.rpm:1240799558

From c013250c81041c64b09ad51e1679701a2ec2eb33 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 30 Jul 2010 19:27:50 -0400
Subject: [PATCH 09/45] * Fri Jul 30 2010 David Malcolm <dmalcolm@redhat.com> -
 3.9.5-3 - remove requirement on python-zope-exceptions for now (bug 619478) -
 add missing zope-testrunner executable to %%files

---
 python-zope-testing.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index ddda84a..561a527 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -4,7 +4,7 @@
 
 Name:           python-zope-testing
 Version:        3.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -55,12 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/zope-testrunner
 %{_docdir}/%{name}-%{version}/
 %{python_sitelib}/zope/testing/
 %{python_sitelib}/zope.testing*
 
 
 %changelog
+* Fri Jul 30 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-3
+- remove requirement on python-zope-exceptions for now (bug 619478)
+- add missing zope-testrunner executable to %%files
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 

From e3d9e64431a1a98a51ee58b813ce66ac4702c01c Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 30 Jul 2010 20:11:15 -0400
Subject: [PATCH 10/45] add missing build-time requirement on python-setuptools

---
 python-zope-testing.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 561a527..2d0eac8 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -4,7 +4,7 @@
 
 Name:           python-zope-testing
 Version:        3.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -14,6 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 Requires:       python-zope-filesystem
 Requires:       python-zope-exceptions
 Requires:       python-zope-interface
@@ -62,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 30 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-4
+- add missing build-time requirement on python-setuptools
+
 * Fri Jul 30 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-3
 - remove requirement on python-zope-exceptions for now (bug 619478)
 - add missing zope-testrunner executable to %%files

From da7a98357d2cc22a59adc1f25504b6175167d4cf Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Sat, 31 Jul 2010 06:25:15 -0400
Subject: [PATCH 11/45] actually remove the requirement on
 python-zope-exceptions this time

---
 python-zope-testing.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 2d0eac8..6e890bd 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -4,7 +4,7 @@
 
 Name:           python-zope-testing
 Version:        3.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -16,7 +16,6 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-zope-filesystem
-Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 
 
@@ -63,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 31 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-5
+- actually remove the requirement on python-zope-exceptions this time
+
 * Fri Jul 30 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-4
 - add missing build-time requirement on python-setuptools
 

From 771922e6e2402ab7c8c401af016570f31a66a3bd Mon Sep 17 00:00:00 2001
From: Robin Lee <robinlee.sysu@gmail.com>
Date: Mon, 30 Aug 2010 12:52:58 +0800
Subject: [PATCH 12/45] - Update to 3.10.0 - Rearrange documents

---
 .gitignore               |  1 +
 python-zope-testing.spec | 21 +++++++--------------
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index f957636..0e49385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zope.testing-3.9.5.tar.gz
+/zope.testing-3.10.0.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 6e890bd..3a8ce83 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -3,8 +3,8 @@
 %endif
 
 Name:           python-zope-testing
-Version:        3.9.5
-Release:        5%{?dist}
+Version:        3.10.0
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -39,29 +39,22 @@ rm -rf $RPM_BUILD_ROOT
 # Use the __init__.py from python-zope-filesystem instead.
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
-# Deal with documents
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/testing/*.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/zope/testing/testrunner/*.txt
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/testrunner/
-cp -p src/zope/testing/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
-cp -p src/zope/testing/testrunner/*.txt \
-   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/testrunner/
-cp -p COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt \
-   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
- 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/zope-testrunner
-%{_docdir}/%{name}-%{version}/
+%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt
 %{python_sitelib}/zope/testing/
 %{python_sitelib}/zope.testing*
 
 
 %changelog
+* Mon Aug 30 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-1
+- Update to 3.10.0
+- Rearrange documents
+
 * Sat Jul 31 2010 David Malcolm <dmalcolm@redhat.com> - 3.9.5-5
 - actually remove the requirement on python-zope-exceptions this time
 
diff --git a/sources b/sources
index 80871d2..e3f3668 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39092299d71c5dea5378c912df4cc84c  zope.testing-3.9.5.tar.gz
+ec822c281f62097b63f5d45e6e785412  zope.testing-3.10.0.tar.gz

From e1e5386c39ae8f9b969ea668ae5f8c56a0950d6b Mon Sep 17 00:00:00 2001
From: Robin Lee <robinlee.sysu@gmail.com>
Date: Tue, 31 Aug 2010 09:25:49 +0800
Subject: [PATCH 13/45] - Requirement: python-zope-filesystem removed,
 python-zope-exceptions added - Spec cleaned up

---
 python-zope-testing.spec | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 3a8ce83..1661184 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,21 +1,16 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
-
 Name:           python-zope-testing
 Version:        3.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
 URL:            http://pypi.python.org/pypi/zope.testing
 Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testing-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-Requires:       python-zope-filesystem
+Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 
 
@@ -33,24 +28,25 @@ flexible test runner, and supports both doctest and unittest.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-# Use the __init__.py from python-zope-filesystem instead.
+# __init__.py* are not needed since .pth file is used
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt
 %{python_sitelib}/zope/testing/
-%{python_sitelib}/zope.testing*
+%{python_sitelib}/zope.testing-*.egg-info
+%{python_sitelib}/zope.testing-*-nspkg.pth
 
 
 %changelog
+* Tue Aug 31 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-2
+- Requirement: python-zope-filesystem removed, python-zope-exceptions added
+- Spec cleaned up
+
 * Mon Aug 30 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-1
 - Update to 3.10.0
 - Rearrange documents

From 174ee57f41cc133d8c10b61b03edee255ea4a120 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Mon, 3 Jan 2011 21:47:41 +0800
Subject: [PATCH 14/45] - Update to 3.10.2 - Move the documents to proper place
 - Run the tests

---
 .gitignore               |  1 +
 python-zope-testing.spec | 14 +++++++++++---
 sources                  |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0e49385..6127f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 zope.testing-3.9.5.tar.gz
 /zope.testing-3.10.0.tar.gz
+/zope.testing-3.10.2.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 1661184..b39280a 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,6 +1,6 @@
 Name:           python-zope-testing
-Version:        3.10.0
-Release:        2%{?dist}
+Version:        3.10.2
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -33,16 +33,24 @@ flexible test runner, and supports both doctest and unittest.
 # __init__.py* are not needed since .pth file is used
 rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
+%check
+%{__python} setup.py test
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt
+%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt src/zope/testing/*.txt
 %{python_sitelib}/zope/testing/
+%exclude %{python_sitelib}/zope/testing/*.txt
 %{python_sitelib}/zope.testing-*.egg-info
 %{python_sitelib}/zope.testing-*-nspkg.pth
 
 
 %changelog
+* Mon Jan  3 2011 Robin Lee <cheeselee@fedoraproject.org> - 3.10.2-1
+- Update to 3.10.2
+- Move the documents to proper place
+- Run the tests
+
 * Tue Aug 31 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.10.0-2
 - Requirement: python-zope-filesystem removed, python-zope-exceptions added
 - Spec cleaned up
diff --git a/sources b/sources
index e3f3668..b01ab79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec822c281f62097b63f5d45e6e785412  zope.testing-3.10.0.tar.gz
+35fc3139992a92a4db13653167fc7be9  zope.testing-3.10.2.tar.gz

From 22aeb61b5f20e5f58dfff00bf943db80aad938c0 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Mon, 3 Jan 2011 21:55:44 +0800
Subject: [PATCH 15/45] Add BR's for the tests

---
 python-zope-testing.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index b39280a..43fe95f 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -10,6 +10,10 @@ Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testi
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+# for testing
+BuildRequires:  python-zope-exceptions
+BuildRequires:  python-zope-interface
+
 Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 

From 6775aa2c903ac87e3f44048041e1edc5f7654b72 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 9 Feb 2011 01:38:26 -0600
Subject: [PATCH 16/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 43fe95f..0f56588 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,6 +1,6 @@
 Name:           python-zope-testing
 Version:        3.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -50,6 +50,9 @@ rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
 
 %changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jan  3 2011 Robin Lee <cheeselee@fedoraproject.org> - 3.10.2-1
 - Update to 3.10.2
 - Move the documents to proper place

From 1b5386b5d81db6f4874837261021de937b5e40b1 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Sat, 7 Jan 2012 18:20:37 +0800
Subject: [PATCH 17/45] Update to 3.10.3 (ZTK 1.1.3)

---
 .gitignore               | 1 +
 python-zope-testing.spec | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6127f20..e67c56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 zope.testing-3.9.5.tar.gz
 /zope.testing-3.10.0.tar.gz
 /zope.testing-3.10.2.tar.gz
+/zope.testing-3.10.3.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 0f56588..d554df7 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,6 +1,6 @@
 Name:           python-zope-testing
-Version:        3.10.2
-Release:        2%{?dist}
+Version:        3.10.3
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -50,6 +50,9 @@ rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
 
 %changelog
+* Sat Jan  7 2012 Robin Lee <cheeselee@fedoraproject.org> - 3.10.3-1
+- Update to 3.10.3 (ZTK 1.1.3)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b01ab79..0048c59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35fc3139992a92a4db13653167fc7be9  zope.testing-3.10.2.tar.gz
+d9d6055c0a017271bcc3938c18ea23e8  zope.testing-3.10.3.tar.gz

From 035bba8f05d7ae793f661008f571f0717511ae3f Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 21 Jul 2012 06:32:45 -0500
Subject: [PATCH 18/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index d554df7..58f3ef4 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,6 +1,6 @@
 Name:           python-zope-testing
 Version:        3.10.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -50,6 +50,9 @@ rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
 
 
 %changelog
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Sat Jan  7 2012 Robin Lee <cheeselee@fedoraproject.org> - 3.10.3-1
 - Update to 3.10.3 (ZTK 1.1.3)
 

From b30c6a706433b69891716edb0630bbd92fa85b7b Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 11 Dec 2012 11:39:05 -0500
Subject: [PATCH 19/45] Latest upstream and a python3 subpackage.

---
 .gitignore               |  1 +
 python-zope-testing.spec | 81 +++++++++++++++++++++++++++++++++++-----
 sources                  |  2 +-
 3 files changed, 73 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e67c56b..9d18371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ zope.testing-3.9.5.tar.gz
 /zope.testing-3.10.0.tar.gz
 /zope.testing-3.10.2.tar.gz
 /zope.testing-3.10.3.tar.gz
+/zope.testing-4.1.1.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 58f3ef4..49a149a 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,19 +1,31 @@
+%global modname zope.testing
+
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 1
+%endif
+
 Name:           python-zope-testing
-Version:        3.10.3
-Release:        2%{?dist}
+Version:        4.1.1
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
-URL:            http://pypi.python.org/pypi/zope.testing
-Source0:        http://pypi.python.org/packages/source/z/zope.testing/zope.testing-%{version}.tar.gz
+URL:            http://pypi.python.org/pypi/%{modname}
+Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-# for testing
 BuildRequires:  python-zope-exceptions
 BuildRequires:  python-zope-interface
 
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-zope-exceptions
+BuildRequires:  python3-zope-interface
+%endif
+
 Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 
@@ -22,34 +34,83 @@ Requires:       python-zope-interface
 This package provides a number of testing frameworks. It includes a
 flexible test runner, and supports both doctest and unittest.
 
+%if 0%{?with_python3}
+%package -n python3-zope-testing
+Summary:        Zope Testing Framework
+Group:          Development/Languages
+
+Requires:       python3-zope-exceptions
+Requires:       python3-zope-interface
+
+%description -n python3-zope-testing
+This package provides a number of testing frameworks. It includes a
+flexible test runner, and supports both doctest and unittest.
+%endif
 
 %prep
-%setup -q -n zope.testing-%{version}
+%setup -q -n %{modname}-%{version}
+
+rm -rf %{modname}.egg-info
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif
 
 %install
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+# __init__.py* are not needed since .pth file is used
+rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
+popd
+%endif
+
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # __init__.py* are not needed since .pth file is used
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/__init__.py*
+rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 
 %check
 %{__python} setup.py test
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif
 
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt src/zope/testing/*.txt
 %{python_sitelib}/zope/testing/
 %exclude %{python_sitelib}/zope/testing/*.txt
-%{python_sitelib}/zope.testing-*.egg-info
-%{python_sitelib}/zope.testing-*-nspkg.pth
+%{python_sitelib}/%{modname}-*.egg-info
+%{python_sitelib}/%{modname}-*-nspkg.pth
 
+%if 0%{?with_python3}
+%files -n python3-zope-testing
+%defattr(-,root,root,-)
+%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt src/zope/testing/*.txt
+%{python3_sitelib}/zope/testing/
+%exclude %{python3_sitelib}/zope/testing/*.txt
+%{python3_sitelib}/%{modname}-*.egg-info
+%{python3_sitelib}/%{modname}-*-nspkg.pth
+%endif
 
 %changelog
+* Tue Dec 11 2012 Ralph Bean <rbean@redhat.com> - 4.1.1-1
+- Latest upstream release.
+- Packaged a python3 subpackage.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 0048c59..301dba8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9d6055c0a017271bcc3938c18ea23e8  zope.testing-3.10.3.tar.gz
+2e3829841090d6adff718b8b73c87b6b  zope.testing-4.1.1.tar.gz

From 9b28fd078c2a6bb9546f6f0dd47d22c669fd91cb Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 11 Dec 2012 14:47:14 -0500
Subject: [PATCH 20/45] Disable tests for python3.

---
 python-zope-testing.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 49a149a..db06e67 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -82,11 +82,13 @@ rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 
 %check
 %{__python} setup.py test
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py test
-popd
-%endif
+
+# The python3.3 tests don't completely pass yet.
+#%if 0%{?with_python3}
+#pushd %{py3dir}
+#%{__python3} setup.py test
+#popd
+#%endif
 
 %files
 %defattr(-,root,root,-)

From 53a0c82ba36eca245952dc907f10b25b8fd9e1f3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 14:57:57 -0600
Subject: [PATCH 21/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index db06e67..52a0377 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -6,7 +6,7 @@
 
 Name:           python-zope-testing
 Version:        4.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -109,6 +109,9 @@ rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Dec 11 2012 Ralph Bean <rbean@redhat.com> - 4.1.1-1
 - Latest upstream release.
 - Packaged a python3 subpackage.

From abe95bde3e3c17411c79f0f5829388b69b51dc82 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 25 Feb 2013 14:47:58 -0500
Subject: [PATCH 22/45] Latest upstream fixes py3 test suite.

---
 .gitignore               |  1 +
 python-zope-testing.spec | 29 +++++++++++++++++------------
 sources                  |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9d18371..9c1e18f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ zope.testing-3.9.5.tar.gz
 /zope.testing-3.10.2.tar.gz
 /zope.testing-3.10.3.tar.gz
 /zope.testing-4.1.1.tar.gz
+/zope.testing-4.1.2.zip
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 52a0377..838416e 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,17 +1,17 @@
 %global modname zope.testing
 
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
 Name:           python-zope-testing
-Version:        4.1.1
-Release:        2%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
 URL:            http://pypi.python.org/pypi/%{modname}
-Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
 
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -83,16 +83,15 @@ rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 %check
 %{__python} setup.py test
 
-# The python3.3 tests don't completely pass yet.
-#%if 0%{?with_python3}
-#pushd %{py3dir}
-#%{__python3} setup.py test
-#popd
-#%endif
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py test
+popd
+%endif
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt src/zope/testing/*.txt
+%doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python_sitelib}/zope/testing/
 %exclude %{python_sitelib}/zope/testing/*.txt
 %{python_sitelib}/%{modname}-*.egg-info
@@ -101,7 +100,7 @@ rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 %if 0%{?with_python3}
 %files -n python3-zope-testing
 %defattr(-,root,root,-)
-%doc COPYRIGHT.txt LICENSE.txt CHANGES.txt README.txt src/zope/testing/*.txt
+%doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python3_sitelib}/zope/testing/
 %exclude %{python3_sitelib}/zope/testing/*.txt
 %{python3_sitelib}/%{modname}-*.egg-info
@@ -109,6 +108,12 @@ rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Mon Feb 25 2013 Ralph Bean <rbean@redhat.com> - 4.1.2-1
+- Latest upstream.
+- Enabled python3 tests in the check section.
+- Updated the with_python3 conditional.
+- README and CHANGES renamed from .txt to .rst.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 301dba8..b4f5000 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e3829841090d6adff718b8b73c87b6b  zope.testing-4.1.1.tar.gz
+01c30c342c6a18002a762bd5d320a6e9  zope.testing-4.1.2.zip

From 322bd14f86b0dc521b1d1fdc979d984b59199c7e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 06:07:02 -0500
Subject: [PATCH 23/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 838416e..b83da9e 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -6,7 +6,7 @@
 
 Name:           python-zope-testing
 Version:        4.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -108,6 +108,9 @@ popd
 %endif
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon Feb 25 2013 Ralph Bean <rbean@redhat.com> - 4.1.2-1
 - Latest upstream.
 - Enabled python3 tests in the check section.

From d35f09905f791f5f7e74e9f7e7a884833a30f596 Mon Sep 17 00:00:00 2001
From: Slavek Kabrda <bkabrda@redhat.com>
Date: Fri, 16 May 2014 11:17:46 +0200
Subject: [PATCH 24/45] Rebuilt for
 https://fedoraproject.org/wiki/Changes/Python_3.4

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index b83da9e..8cbc9ea 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -6,7 +6,7 @@
 
 Name:           python-zope-testing
 Version:        4.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -108,6 +108,9 @@ popd
 %endif
 
 %changelog
+* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 4.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 440659e4438357d4d975142cc927cb3a1fa24779 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 19:36:54 -0500
Subject: [PATCH 25/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 8cbc9ea..9d23dff 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -6,7 +6,7 @@
 
 Name:           python-zope-testing
 Version:        4.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -108,6 +108,9 @@ popd
 %endif
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 4.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
 

From 0ab0151e8056ce42c3ae5bae551ce11d96c32e8c Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 20 Aug 2014 11:23:06 -0400
Subject: [PATCH 26/45] 4.1.3-1

---
 .gitignore               |  1 +
 python-zope-testing.spec | 30 ++++++++++++++++++++----------
 sources                  |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c1e18f..1ce958f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ zope.testing-3.9.5.tar.gz
 /zope.testing-3.10.3.tar.gz
 /zope.testing-4.1.1.tar.gz
 /zope.testing-4.1.2.zip
+/zope.testing-4.1.3.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 9d23dff..4e49451 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -1,3 +1,9 @@
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2:        %global __python2 /usr/bin/python2}
+%{!?python2_sitelib:  %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
 %global modname zope.testing
 
 %if 0%{?fedora}
@@ -5,8 +11,8 @@
 %endif
 
 Name:           python-zope-testing
-Version:        4.1.2
-Release:        4%{?dist}
+Version:        4.1.3
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -58,7 +64,7 @@ cp -a . %{py3dir}
 %endif
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -75,13 +81,13 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 popd
 %endif
 
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 # __init__.py* are not needed since .pth file is used
-rm -f %{buildroot}%{python_sitelib}/zope/__init__.py*
+rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py*
 
 %check
-%{__python} setup.py test
+%{__python2} setup.py test
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -92,10 +98,10 @@ popd
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
-%{python_sitelib}/zope/testing/
-%exclude %{python_sitelib}/zope/testing/*.txt
-%{python_sitelib}/%{modname}-*.egg-info
-%{python_sitelib}/%{modname}-*-nspkg.pth
+%{python2_sitelib}/zope/testing/
+%exclude %{python2_sitelib}/zope/testing/*.txt
+%{python2_sitelib}/%{modname}-*.egg-info
+%{python2_sitelib}/%{modname}-*-nspkg.pth
 
 %if 0%{?with_python3}
 %files -n python3-zope-testing
@@ -108,6 +114,10 @@ popd
 %endif
 
 %changelog
+* Wed Aug 20 2014 Ralph Bean <rbean@redhat.com> - 4.1.3-1
+- Latest upstream.
+- Modernized python macros.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b4f5000..6a09f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01c30c342c6a18002a762bd5d320a6e9  zope.testing-4.1.2.zip
+6c73c5b668a67fdc116a25b884058ed9  zope.testing-4.1.3.tar.gz

From 506d387c632bb82ce19561030e85ef8b46dcae2d Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 20 Aug 2014 11:31:22 -0400
Subject: [PATCH 27/45] .tar.gz

---
 python-zope-testing.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 4e49451..eedb086 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -17,7 +17,7 @@ Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
 URL:            http://pypi.python.org/pypi/%{modname}
-Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
+Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python-devel

From d6125de3290eb5ef6e4d50734003b92a650d866b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Jun 2015 21:29:37 +0000
Subject: [PATCH 28/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index eedb086..8828fdf 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -114,6 +114,9 @@ popd
 %endif
 
 %changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Wed Aug 20 2014 Ralph Bean <rbean@redhat.com> - 4.1.3-1
 - Latest upstream.
 - Modernized python macros.

From acc73c8626e984fcac87d702789cf5080c24ee93 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 15 Sep 2015 21:07:34 -0400
Subject: [PATCH 29/45] 4.5.0

---
 .gitignore               | 1 +
 python-zope-testing.spec | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ce958f..5424f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ zope.testing-3.9.5.tar.gz
 /zope.testing-4.1.1.tar.gz
 /zope.testing-4.1.2.zip
 /zope.testing-4.1.3.tar.gz
+/zope.testing-4.5.0.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 8828fdf..074783f 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -11,8 +11,8 @@
 %endif
 
 Name:           python-zope-testing
-Version:        4.1.3
-Release:        2%{?dist}
+Version:        4.5.0
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -114,6 +114,9 @@ popd
 %endif
 
 %changelog
+* Wed Sep 16 2015 Ralph Bean <rbean@redhat.com> - 4.5.0-1
+- new version
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 6a09f47..25d0d93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c73c5b668a67fdc116a25b884058ed9  zope.testing-4.1.3.tar.gz
+def13af47eb8f00a6e4c5558563c6bdc  zope.testing-4.5.0.tar.gz

From 9a3b99781d6d2508936c33d9c9f60b8d92afed2f Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 10 Nov 2015 17:57:51 +0000
Subject: [PATCH 30/45] - Rebuilt for
 https://fedoraproject.org/wiki/Changes/python3.5

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 074783f..a19b083 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -114,6 +114,9 @@ popd
 %endif
 
 %changelog
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
 * Wed Sep 16 2015 Ralph Bean <rbean@redhat.com> - 4.5.0-1
 - new version
 

From 1ad12ca210fc64d4db1410f0bc400b81fa69dcac Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 4 Feb 2016 21:30:25 +0000
Subject: [PATCH 31/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index a19b083..39086a9 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -114,6 +114,9 @@ popd
 %endif
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 

From f5f48cbd35d6d26662fb695e005fcd92fd257df8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 12:17:18 +0000
Subject: [PATCH 32/45] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 39086a9..3ed18c4 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -114,6 +114,9 @@ popd
 %endif
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.0-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From c16e819da090fa1348eb179f715e82952c8ae1ef Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 19 Jul 2016 08:31:47 -0400
Subject: [PATCH 33/45] Add an explicit python2 subpackage.

---
 python-zope-testing.spec | 69 +++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 3ed18c4..8756b8a 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -20,23 +20,25 @@ URL:            http://pypi.python.org/pypi/%{modname}
 Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python-zope-exceptions
-BuildRequires:  python-zope-interface
 
-%if 0%{?with_python3}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-zope-exceptions
-BuildRequires:  python3-zope-interface
-%endif
+%description
+This package provides a number of testing frameworks. It includes a
+flexible test runner, and supports both doctest and unittest.
 
-Requires:       python-zope-exceptions
-Requires:       python-zope-interface
 
+%package -n python2-zope-testing
+Summary:        Zope Testing Framework
+Group:          Development/Languages
+%{?python_provide:%python_provide python2-zope-testing}
 
-%description
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-zope-exceptions
+BuildRequires:  python2-zope-interface
+Requires:       python2-zope-exceptions
+Requires:       python2-zope-interface
+
+%description -n python2-zope-testing
 This package provides a number of testing frameworks. It includes a
 flexible test runner, and supports both doctest and unittest.
 
@@ -44,6 +46,12 @@ flexible test runner, and supports both doctest and unittest.
 %package -n python3-zope-testing
 Summary:        Zope Testing Framework
 Group:          Development/Languages
+%{?python_provide:%python_provide python3-zope-testing}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-zope-exceptions
+BuildRequires:  python3-zope-interface
 
 Requires:       python3-zope-exceptions
 Requires:       python3-zope-interface
@@ -58,44 +66,29 @@ flexible test runner, and supports both doctest and unittest.
 
 rm -rf %{modname}.egg-info
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
 %build
-%{__python2} setup.py build
-
+%{py2_build}
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
+%{py3_build}
 %endif
 
 %install
+%{py2_install}
+# __init__.py* are not needed since .pth file is used
+rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py*
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+%{py3_install}
 # __init__.py* are not needed since .pth file is used
 rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
-popd
 %endif
 
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
-
-# __init__.py* are not needed since .pth file is used
-rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py*
-
 %check
 %{__python2} setup.py test
-
 %if 0%{?with_python3}
-pushd %{py3dir}
 %{__python3} setup.py test
-popd
 %endif
 
-%files
+%files -n python2-zope-testing
 %defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python2_sitelib}/zope/testing/
@@ -114,6 +107,10 @@ popd
 %endif
 
 %changelog
+* Mon Jul 18 2016 Ralph Bean <rbean@redhat.com> - 4.5.0-5
+- Add an explicit python2 subpackage.
+- Modernize python macros.
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.5.0-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 

From 5e5f69bec119c9a0ede0b13203eba0090de09411 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 19 Jul 2016 08:33:19 -0400
Subject: [PATCH 34/45] Adjust changelog after rebase.

---
 python-zope-testing.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 8756b8a..f465c47 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -107,7 +107,7 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
-* Mon Jul 18 2016 Ralph Bean <rbean@redhat.com> - 4.5.0-5
+* Tue Jul 19 2016 Ralph Bean <rbean@redhat.com> - 4.5.0-5
 - Add an explicit python2 subpackage.
 - Modernize python macros.
 

From 16a99213844fa8a6428deeeda33997e726ee2349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Dec 2016 18:20:38 +0100
Subject: [PATCH 35/45] Rebuild for Python 3.6

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index f465c47..c6a38b2 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.5.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 4.5.0-6
+- Rebuild for Python 3.6
+
 * Tue Jul 19 2016 Ralph Bean <rbean@redhat.com> - 4.5.0-5
 - Add an explicit python2 subpackage.
 - Modernize python macros.

From eeb588064bb442988dda07284a3fb2fb1fd2a2c3 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 5 Jan 2017 08:51:59 -0500
Subject: [PATCH 36/45] 4.6.1

---
 .gitignore               |  1 +
 python-zope-testing.spec | 11 +++++++----
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5424f57..591a0fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ zope.testing-3.9.5.tar.gz
 /zope.testing-4.1.2.zip
 /zope.testing-4.1.3.tar.gz
 /zope.testing-4.5.0.tar.gz
+/zope.testing-4.6.1.tar.gz
diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index c6a38b2..cd8c382 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -11,13 +11,13 @@
 %endif
 
 Name:           python-zope-testing
-Version:        4.5.0
-Release:        6%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
-URL:            http://pypi.python.org/pypi/%{modname}
-Source0:        http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
+URL:            https://pypi.io/project/%{modname}
+Source0:        https://pypi.io/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Thu Jan 05 2017 Ralph Bean <rbean@redhat.com> - 4.6.1-1
+- new version
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 4.5.0-6
 - Rebuild for Python 3.6
 
diff --git a/sources b/sources
index 25d0d93..70df1af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-def13af47eb8f00a6e4c5558563c6bdc  zope.testing-4.5.0.tar.gz
+SHA512 (zope.testing-4.6.1.tar.gz) = 13ab0ce01efc42227980e79e97ea91d37d377b83d38e897750cee344e9ab1a82f6d860d7884374da55cd0e102447f56fb69970fbfad2de927c0cee3c18b0ddb9

From 6f308f1f1635a7fb8611a7b1bfa07a9ce74f2b2b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 11:02:58 +0000
Subject: [PATCH 37/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index cd8c382..56d5449 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Jan 05 2017 Ralph Bean <rbean@redhat.com> - 4.6.1-1
 - new version
 

From d8f955ad8c70f4f7fa0b0633e7f348deb11f2ab7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 12:24:49 +0000
Subject: [PATCH 38/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 56d5449..585b158 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 65ff9c72ad4b3d89ab58bea60497e480852e0230 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 11:53:01 +0000
Subject: [PATCH 39/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 585b158..9e48245 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From a6f6dd39dabe4c7976ef7864bccec20615d37d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 18 Jun 2018 00:03:23 +0200
Subject: [PATCH 40/45] Rebuilt for Python 3.7

---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 9e48245..01543b1 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -107,6 +107,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 4.6.1-5
+- Rebuilt for Python 3.7
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From c5f5f30d580a111c5119bfd1702ec59fd2c5b48d Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Jul 2018 02:09:32 -0500
Subject: [PATCH 41/45] Remove needless use of %defattr

---
 python-zope-testing.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 01543b1..1231edd 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -89,7 +89,6 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %files -n python2-zope-testing
-%defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python2_sitelib}/zope/testing/
 %exclude %{python2_sitelib}/zope/testing/*.txt
@@ -98,7 +97,6 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 
 %if 0%{?with_python3}
 %files -n python3-zope-testing
-%defattr(-,root,root,-)
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python3_sitelib}/zope/testing/
 %exclude %{python3_sitelib}/zope/testing/*.txt

From 700cf2e2e876803a25b3085fac7994c2c893a917 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 02:48:05 +0000
Subject: [PATCH 42/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index 1231edd..e8da138 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Zope Testing Framework
 Group:          Development/Languages
 License:        ZPLv2.1
@@ -105,6 +105,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 4.6.1-5
 - Rebuilt for Python 3.7
 

From 59f37809a79798eeded5cf7cf2f619d59647b8ca Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:18:19 +0100
Subject: [PATCH 43/45] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 python-zope-testing.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index e8da138..ccce205 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -14,7 +14,6 @@ Name:           python-zope-testing
 Version:        4.6.1
 Release:        6%{?dist}
 Summary:        Zope Testing Framework
-Group:          Development/Languages
 License:        ZPLv2.1
 URL:            https://pypi.io/project/%{modname}
 Source0:        https://pypi.io/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
@@ -28,7 +27,6 @@ flexible test runner, and supports both doctest and unittest.
 
 %package -n python2-zope-testing
 Summary:        Zope Testing Framework
-Group:          Development/Languages
 %{?python_provide:%python_provide python2-zope-testing}
 
 BuildRequires:  python2-devel
@@ -45,7 +43,6 @@ flexible test runner, and supports both doctest and unittest.
 %if 0%{?with_python3}
 %package -n python3-zope-testing
 Summary:        Zope Testing Framework
-Group:          Development/Languages
 %{?python_provide:%python_provide python3-zope-testing}
 
 BuildRequires:  python3-devel

From 187421d79d0faca320e6b2c5492539be37001801 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 10:16:08 +0000
Subject: [PATCH 44/45] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-zope-testing.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index ccce205..eb8145f 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -12,7 +12,7 @@
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Zope Testing Framework
 License:        ZPLv2.1
 URL:            https://pypi.io/project/%{modname}
@@ -102,6 +102,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 10049e97493cc8dfd981b1969b3d15707a3494d0 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Sat, 9 Mar 2019 13:26:55 -0600
Subject: [PATCH 45/45] EPEL compatibility

---
 python-zope-testing.spec | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/python-zope-testing.spec b/python-zope-testing.spec
index eb8145f..e9275a9 100644
--- a/python-zope-testing.spec
+++ b/python-zope-testing.spec
@@ -6,13 +6,11 @@
 
 %global modname zope.testing
 
-%if 0%{?fedora}
-%global with_python3 1
-%endif
+%bcond_without  python3
 
 Name:           python-zope-testing
 Version:        4.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Zope Testing Framework
 License:        ZPLv2.1
 URL:            https://pypi.io/project/%{modname}
@@ -40,20 +38,19 @@ Requires:       python2-zope-interface
 This package provides a number of testing frameworks. It includes a
 flexible test runner, and supports both doctest and unittest.
 
-%if 0%{?with_python3}
-%package -n python3-zope-testing
+%if %{with python3}
+%package -n python%{python3_pkgversion}-zope-testing
 Summary:        Zope Testing Framework
-%{?python_provide:%python_provide python3-zope-testing}
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-zope-exceptions
-BuildRequires:  python3-zope-interface
+%{?python_provide:%python_provide python%{python3_pkgversion}-zope-testing}
 
-Requires:       python3-zope-exceptions
-Requires:       python3-zope-interface
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-zope-exceptions
+BuildRequires:  python%{python3_pkgversion}-zope-interface
+Requires:       python%{python3_pkgversion}-zope-exceptions
+Requires:       python%{python3_pkgversion}-zope-interface
 
-%description -n python3-zope-testing
+%description -n python%{python3_pkgversion}-zope-testing
 This package provides a number of testing frameworks. It includes a
 flexible test runner, and supports both doctest and unittest.
 %endif
@@ -65,7 +62,7 @@ rm -rf %{modname}.egg-info
 
 %build
 %{py2_build}
-%if 0%{?with_python3}
+%if %{with python3}
 %{py3_build}
 %endif
 
@@ -73,7 +70,7 @@ rm -rf %{modname}.egg-info
 %{py2_install}
 # __init__.py* are not needed since .pth file is used
 rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py*
-%if 0%{?with_python3}
+%if %{with python3}
 %{py3_install}
 # __init__.py* are not needed since .pth file is used
 rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
@@ -81,7 +78,7 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 
 %check
 %{__python2} setup.py test
-%if 0%{?with_python3}
+%if %{with python3}
 %{__python3} setup.py test
 %endif
 
@@ -92,8 +89,8 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %{python2_sitelib}/%{modname}-*.egg-info
 %{python2_sitelib}/%{modname}-*-nspkg.pth
 
-%if 0%{?with_python3}
-%files -n python3-zope-testing
+%if %{with python3}
+%files -n python%{python3_pkgversion}-zope-testing
 %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt
 %{python3_sitelib}/zope/testing/
 %exclude %{python3_sitelib}/zope/testing/*.txt
@@ -102,6 +99,9 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py*
 %endif
 
 %changelog
+* Sat Mar 09 2019 Carl George <carl@george.computer> - 4.6.1-8
+- EPEL compatibility
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild