python-ZODB3-3.9.5-2

3 files changed, 6 insertions, 17 deletions

diff --git a/python-Persistence/F-13/python-Persistence.spec b/python-Persistence/F-13/python-Persistence.spec
index 1f448ce..aa0942f 100644
--- a/python-Persistence/F-13/python-Persistence.spec
+++ b/python-Persistence/F-13/python-Persistence.spec
@@ -10,14 +10,11 @@ Name: python-%{modname}
 Version: %{version}
 Release: %{release}%{?dist}
 Source0: http://pypi.python.org/packages/source/P/%{modname}/%{modname}-%{version}.zip
-# lp587760, patch provided by Artur Zaprzała <https://launchpad.net/~arturz>
-#Patch0:  Persistence-2.13.1-tp_basicsize.patch
 License: ZPLv2.1
 Group: Development/Libraries
 URL: http://pypi.python.org/pypi/Persistence
 
 BuildRequires: python2-devel
-#BuildRequires: python-ExtensionClass-devel
 BuildRequires: python-setuptools
 Requires: python-ExtensionClass
 Requires: python-ZODB3
@@ -29,7 +26,6 @@ use persistent.Persistent from ZODB3.
 
 %prep
 %setup -q -n %{modname}-%{version}
-#%patch0 -p1 -b .tp_basicsize
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
diff --git a/python-ThreadLock/F-13/python-ThreadLock.spec b/python-ThreadLock/F-13/python-ThreadLock.spec
index 58a96b5..7f7bfa9 100644
--- a/python-ThreadLock/F-13/python-ThreadLock.spec
+++ b/python-ThreadLock/F-13/python-ThreadLock.spec
@@ -16,7 +16,6 @@ URL: http://pypi.python.org/pypi/ThreadLock
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
-#BuildRequires: python-ExtensionClass-devel
 Requires: python-ExtensionClass
 
 %description
diff --git a/python-ZODB3/F-13/python-ZODB3.spec b/python-ZODB3/F-13/python-ZODB3.spec
index 0c1fa9d..8e7b574 100644
--- a/python-ZODB3/F-13/python-ZODB3.spec
+++ b/python-ZODB3/F-13/python-ZODB3.spec
@@ -5,7 +5,7 @@
 
 Name:           python-ZODB3
 Version:        3.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Zope Object Database: Object Database and Persistence
 Group:          Development/Libraries
 License:        ZPLv2.1
@@ -13,7 +13,7 @@ URL:            http://pypi.python.org/pypi/ZODB3
 Source0:        http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 Requires:       python-transaction
 Requires:       python-zc-lockfile
@@ -65,15 +65,6 @@ for MOD in BTrees persistent; do
   mv $RPM_BUILD_ROOT%{python_sitearch}/$MOD/*.h \
      $RPM_BUILD_ROOT%{_includedir}/python%{py_ver}/$MOD/
 done
-# move some documents to stardard paths
-for MOD in BTrees persistent ZODB ZEO; do
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$MOD/
-  rm -f $RPM_BUILD_ROOT%{python_sitearch}/$MOD/*.txt
-  cp -p src/$MOD/*.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$MOD/
-done
-# install more documents
-cp -p COPYRIGHT.txt LICENSE.txt HISTORY.txt README.txt doc/* \
-   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/
+%doc COPYRIGHT.txt LICENSE.txt HISTORY.txt README.txt doc/*
 %{python_sitearch}/ZODB/
 %{python_sitearch}/ZODB3-*.egg-info
 %{_bindir}/*
@@ -96,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/python%{py_ver}/persistent
 
 %changelog
+* Tue Jun 22 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.5-2
+- Don't move the text files
+
 * Wed Jun 16 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.9.5-1
 - Update to 3.9.5
 - Take over the review request (#476600).