From 7e91f481a054447e981325a9b52fb0075747f4a1 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Wed, 16 Jun 2010 19:44:17 +0800 Subject: python-ZODB3 3.9.5-1 --- python-ZODB3/F-13/python-ZODB3.spec | 140 ++++++++++++++---------------------- 1 file changed, 52 insertions(+), 88 deletions(-) diff --git a/python-ZODB3/F-13/python-ZODB3.spec b/python-ZODB3/F-13/python-ZODB3.spec index dd16974..ecda15c 100644 --- a/python-ZODB3/F-13/python-ZODB3.spec +++ b/python-ZODB3/F-13/python-ZODB3.spec @@ -1,7 +1,10 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%include %{_rpmconfigdir}/macros.python +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif Name: python-ZODB3 -Version: 3.9.3 +Version: 3.9.5 Release: 1%{?dist} Summary: Zope Object Database: Object Database and Persistence Group: Development/Libraries @@ -11,12 +14,7 @@ Source0: http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-%{version}. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel -# The following are needed if the %%check section is re-enabled. -#BuildRequires: python-transaction -#BuildRequires: python-zdaemon -#BuildRequires: python-zope-interface -#BuildRequires: python-zope-proxy -#BuildRequires: python-zope-testing +BuildRequires: python-setuptools Requires: python-transaction Requires: python-zc-lockfile Requires: python-ZConfig @@ -24,70 +22,24 @@ Requires: python-zdaemon Requires: python-zope-event Requires: python-zope-interface Requires: python-zope-proxy -Requires: python-zope-testing - -Requires: python-ZEO -Requires: python-BTrees -Requires: python-persistent - %description The Zope Object Database provides an object-oriented database for Python that provides a high-degree of transparency. Applications can take advantage of object database features with few, if any, changes to -application logic. ZODB includes features such as a plugable storage +application logic. ZODB includes features such as a pluggable storage interface, rich transaction support, and undo. +%package devel +Summary: Developer files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python2-devel +BuildArch: noarch -%package -n python-BTrees -Summary: Zope Object Database: BTrees library -Group: Development/Libraries -License: ZPLv2.1 -Requires: python-transaction -Requires: python-zc-lockfile -Requires: python-ZConfig -Requires: python-zdaemon -Requires: python-zope-event -Requires: python-zope-interface -Requires: python-zope-proxy -Requires: python-zope-testing - -%description -n python-BTrees -A BTree library for Python. Part of python-ZODB3. - -%package -n python-persistent -Summary: Zope Object Database: Object Persistence -Group: Development/Libraries -License: ZPLv2.1 -Requires: python-transaction -Requires: python-zc-lockfile -Requires: python-ZConfig -Requires: python-zdaemon -Requires: python-zope-event -Requires: python-zope-interface -Requires: python-zope-proxy -Requires: python-zope-testing - -%description -n python-persistent -A Python object persistence framework. - -%package -n python-ZEO -Summary: Zope Object Database: Zope Enterprise Objects -Group: Development/Libraries -License: ZPLv2.1 -Requires: python-transaction -Requires: python-zc-lockfile -Requires: python-ZConfig -Requires: python-zdaemon -Requires: python-zope-event -Requires: python-zope-interface -Requires: python-zope-proxy -Requires: python-zope-testing - -%description -n python-ZEO -ZEO is an add-on for Zope that allows multiple processes to connect -to a single ZODB storage. - +%description devel +Files for developing applications using Python extensions of ZODB, BTrees and +persistent. %prep %setup -q -n ZODB3-%{version} @@ -105,44 +57,56 @@ 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 -mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name} -for binary in fsdump fsoids fsrefs fstail mkzeoinst repozo runzeo zeoctl \ - zeopack zeopasswd; do - mv $RPM_BUILD_ROOT{%{_bindir}/${binary},%{_libexecdir}/%{name}/${binary}} +# remove contained source file(s) +find $RPM_BUILD_ROOT -name '*.c' -type f -print0 | xargs -0 rm -fv +# deal with header file(s) +for MOD in BTrees persistent; do + mkdir -p $RPM_BUILD_ROOT%{_includedir}/python%{py_ver}/$MOD/ + 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/ + mv $RPM_BUILD_ROOT%{python_sitearch}/$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}/ - -# Disabled because tests fail for some reason I don't have the time to -# examine/fix. -#%%check -#%{__python} setup.py test - - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc HISTORY.txt README.txt -%{python_sitearch}/ZODB* -%{_libexecdir}/%{name} -%{_includedir}/python?.?/ZODB3 - -%files -n python-BTrees -%defattr(-,root,root,-) +%{_defaultdocdir}/%{name}-%{version}/ +%{python_sitearch}/ZODB/ +%{python_sitearch}/ZODB3-*.egg-info +%{_bindir}/* %{python_sitearch}/BTrees - -%files -n python-persistent -%defattr(-,root,root,-) %{python_sitearch}/persistent - -%files -n python-ZEO -%defattr(-,root,root,-) %{python_sitearch}/ZEO +%files devel +%defattr(-,root,root,-) +%{_includedir}/python%{py_ver}/ZODB3 +%{_includedir}/python%{py_ver}/BTrees +%{_includedir}/python%{py_ver}/persistent %changelog +* Wed Jun 16 2010 Robin Lee - 3.9.5-1 +- Update to 3.9.5 +- Take over the review request (#476600). +- Don't split out per-extension subpackages. +- BR: python-setuptools added +- Requires: python-zope-testing removed +- Make a -devel subpackage to contain all the header files +- Remove the C source files installed by setup.py +- Include more documents +- Don't move the executable scripts + * Wed Oct 28 2009 Conrad Meyer - 3.9.3-1 - Bumped to 3.9.3. - Numerous minor fixes from review (#476600). -- cgit