From db15b69128cc0db717004d8b088e1723dec94ca8 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Fri, 18 Jun 2010 20:41:59 +0800 Subject: zope 2.12.7-1 and its full dependencies --- python-five-formlib/F-13/python-five-formlib.spec | 2 +- .../F-13/python-zope-app-appsetup.spec | 64 +++++++ .../F-13/python-zope-app-debug.spec | 53 ++++++ .../F-13/python-zope-app-dependable.spec | 55 ++++++ .../F-13/python-zope-app-form.spec | 2 +- .../F-13/python-zope-app-testing.spec | 70 +++++++ python-zope-minmax/F-13/python-zope-minmax.spec | 53 ++++++ .../F-13/python-zope-mkzeoinstance.spec | 3 +- .../F-13/python-zope-password.spec | 52 +++++ python-zope-session/F-13/python-zope-session.spec | 58 ++++++ .../F-13/python-zope-testbrowser.spec | 2 +- zope/F-13/zope-2.10.4-config.patch | 18 -- zope/F-13/zope-2.10.8-configure.patch | 12 -- zope/F-13/zope-2.12.7-config.patch | 18 ++ zope/F-13/zope-README.Fedora | 2 +- zope/F-13/zope.init.in | 18 +- zope/F-13/zope.spec | 209 ++++++++++++++------- zope/F-13/zope.zopectl.in | 6 - 18 files changed, 586 insertions(+), 111 deletions(-) create mode 100644 python-zope-app-appsetup/F-13/python-zope-app-appsetup.spec create mode 100644 python-zope-app-debug/F-13/python-zope-app-debug.spec create mode 100644 python-zope-app-dependable/F-13/python-zope-app-dependable.spec create mode 100644 python-zope-app-testing/F-13/python-zope-app-testing.spec create mode 100644 python-zope-minmax/F-13/python-zope-minmax.spec create mode 100644 python-zope-password/F-13/python-zope-password.spec create mode 100644 python-zope-session/F-13/python-zope-session.spec delete mode 100644 zope/F-13/zope-2.10.4-config.patch delete mode 100644 zope/F-13/zope-2.10.8-configure.patch create mode 100644 zope/F-13/zope-2.12.7-config.patch delete mode 100644 zope/F-13/zope.zopectl.in diff --git a/python-five-formlib/F-13/python-five-formlib.spec b/python-five-formlib/F-13/python-five-formlib.spec index b269f68..4625e95 100644 --- a/python-five-formlib/F-13/python-five-formlib.spec +++ b/python-five-formlib/F-13/python-five-formlib.spec @@ -17,7 +17,7 @@ URL: http://pypi.python.org/pypi/five.formlib BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: python-five-filesystem +Requires: python-zope-filesystem Requires: python-setuptools Requires: python-transaction Requires: python-zope-app-form diff --git a/python-zope-app-appsetup/F-13/python-zope-app-appsetup.spec b/python-zope-app-appsetup/F-13/python-zope-app-appsetup.spec new file mode 100644 index 0000000..dcc8a3a --- /dev/null +++ b/python-zope-app-appsetup/F-13/python-zope-app-appsetup.spec @@ -0,0 +1,64 @@ +%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 +%global modname zope.app.appsetup +%global version 3.14.0 +%global release 1 + +Summary: Zope app setup helper +Name: python-zope-app-appsetup +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.app.appsetup + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-ZODB3 +Requires: python-zope-app-publication +Requires: python-zope-component +Requires: python-zope-configuration +Requires: python-zope-container +Requires: python-zope-error +Requires: python-zope-event +Requires: python-zope-interface +Requires: python-zope-processlifetime +Requires: python-zope-security +Requires: python-zope-session +Requires: python-zope-site +Requires: python-zope-traversing + +%description +This package provides application setup helpers for the Zope3 appserver. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_bindir}/debug +#rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/app/appsetup/*.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt README.txt +#%doc src/zope/app/appsetup/*.txt +%{python_sitelib}/zope/app/appsetup/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.14.0-1 +- Initial packaging diff --git a/python-zope-app-debug/F-13/python-zope-app-debug.spec b/python-zope-app-debug/F-13/python-zope-app-debug.spec new file mode 100644 index 0000000..f33641f --- /dev/null +++ b/python-zope-app-debug/F-13/python-zope-app-debug.spec @@ -0,0 +1,53 @@ +%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 +%global modname zope.app.debug +%global version 3.4.1 +%global release 1 + +Summary: Zope Debug Mode +Name: python-zope-app-debug +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://cheeseshop.python.org/pypi/zope.app.debug + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-zope-publisher +Requires: python-zope-app-appsetup +Requires: python-zope-app-publication + +%description +This package provides a debugger for the Zope publisher. After Zope is +instantiated, it drops the user into an interactive Python shell where the +full Zope environment and the database root are available. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt README.txt +%{python_sitelib}/zope/app/debug/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.4.1-1 +- Initial packaging diff --git a/python-zope-app-dependable/F-13/python-zope-app-dependable.spec b/python-zope-app-dependable/F-13/python-zope-app-dependable.spec new file mode 100644 index 0000000..123ea53 --- /dev/null +++ b/python-zope-app-dependable/F-13/python-zope-app-dependable.spec @@ -0,0 +1,55 @@ +%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 +%global modname zope.app.dependable +%global version 3.5.1 +%global release 1 + +Summary: Simple Dependency API +Name: python-zope-app-dependable +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.app.dependable + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-zope-annotation +Requires: python-zope-exceptions +Requires: python-zope-i18nmessageid +Requires: python-zope-interface +Requires: python-zope-lifecycleevent +Requires: python-zope-location +Requires: python-zope-traversing + +%description +A simple object-dependency framework for Zope. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt README.txt +%{python_sitelib}/zope/app/dependable/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.5.1-1 +- Initial packaging diff --git a/python-zope-app-form/F-13/python-zope-app-form.spec b/python-zope-app-form/F-13/python-zope-app-form.spec index d8dd3f8..ebc4800 100644 --- a/python-zope-app-form/F-13/python-zope-app-form.spec +++ b/python-zope-app-form/F-13/python-zope-app-form.spec @@ -17,7 +17,7 @@ URL: http://pypi.python.org/pypi/zope.app.form BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: python-zope-app-filesystem +Requires: python-zope-filesystem Requires: python-setuptools Requires: python-transaction Requires: python-zope-formlib diff --git a/python-zope-app-testing/F-13/python-zope-app-testing.spec b/python-zope-app-testing/F-13/python-zope-app-testing.spec new file mode 100644 index 0000000..75e6eae --- /dev/null +++ b/python-zope-app-testing/F-13/python-zope-app-testing.spec @@ -0,0 +1,70 @@ +%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 +%global modname zope.app.testing +%global version 3.7.5 +%global release 1 + +Summary: Zope Application Testing Support +Name: python-zope-app-testing +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.app.testing + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-zope-annotation +Requires: python-zope-app-appsetup +Requires: python-zope-processlifetime +Requires: python-zope-app-debug +Requires: python-zope-app-dependable +Requires: python-zope-app-publication +Requires: python-zope-component +Requires: python-zope-container +Requires: python-zope-i18n +Requires: python-zope-interface +Requires: python-zope-password +Requires: python-zope-publisher +Requires: python-zope-schema +Requires: python-zope-security +Requires: python-zope-site +Requires: python-zope-testing +Requires: python-zope-traversing + +%description +This package provides testing support for Zope 3 applications. Besides +providing numerous setup convenience functions, it implements a testing setup +that allows the user to make calls to the publisher allowing to write +functional tests. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT +#rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/app/testing/*.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt CHANGES.txt README.txt COPYRIGHT.txt +#%doc src/zope/app/testing/*.txt +%{python_sitelib}/zope/app/testing/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.7.5-1 +- Initial packaging diff --git a/python-zope-minmax/F-13/python-zope-minmax.spec b/python-zope-minmax/F-13/python-zope-minmax.spec new file mode 100644 index 0000000..3e7778f --- /dev/null +++ b/python-zope-minmax/F-13/python-zope-minmax.spec @@ -0,0 +1,53 @@ +%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 +%global modname zope.minmax +%global version 1.1.2 +%global release 1 + +Summary: Homogeneous values favoring maximum or minimum for ZODB conflict resolution +Name: python-zope-minmax +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.minmax/ + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-ZODB3 +Requires: python-zope-interface + +%description +This package provides support for homogeneous values favoring maximum +or minimum for ZODB conflict resolution. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT +#rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/minmax/*.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt README.txt +#%doc src/zope/minmax/*.txt +%{python_sitelib}/zope/minmax/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 1.1.2-1 +- Initial packaging diff --git a/python-zope-mkzeoinstance/F-13/python-zope-mkzeoinstance.spec b/python-zope-mkzeoinstance/F-13/python-zope-mkzeoinstance.spec index 892251c..f71f48f 100644 --- a/python-zope-mkzeoinstance/F-13/python-zope-mkzeoinstance.spec +++ b/python-zope-mkzeoinstance/F-13/python-zope-mkzeoinstance.spec @@ -34,6 +34,8 @@ python setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install --root=$RPM_BUILD_ROOT +# use the version from zope +rm -fr $RPM_BUILD_ROOT%{_bindir}/mkzeoinstance %clean rm -rf $RPM_BUILD_ROOT @@ -41,7 +43,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE.txt CHANGES.txt README.txt COPYRIGHT.txt -%{_bindir}/mkzeoinstance %{python_sitelib}/zope/mkzeoinstance/ %{python_sitelib}/%{modname}-*.egg-info %{python_sitelib}/%{modname}-*-nspkg.pth diff --git a/python-zope-password/F-13/python-zope-password.spec b/python-zope-password/F-13/python-zope-password.spec new file mode 100644 index 0000000..ed5594e --- /dev/null +++ b/python-zope-password/F-13/python-zope-password.spec @@ -0,0 +1,52 @@ +%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 +%global modname zope.password +%global version 3.6.1 +%global release 1 + +Summary: Password encoding and checking utilities +Name: python-zope-password +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.password + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-zope-component +Requires: python-zope-configuration +Requires: python-zope-interface + +%description +This package provides a password manager mechanism. Password manager is an +utility object that can encode and check encoded passwords. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc LICENSE.txt CHANGES.txt README.txt COPYRIGHT.txt +%{python_sitelib}/zope/password/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.6.1-1 +- Initial packaging diff --git a/python-zope-session/F-13/python-zope-session.spec b/python-zope-session/F-13/python-zope-session.spec new file mode 100644 index 0000000..dc706ae --- /dev/null +++ b/python-zope-session/F-13/python-zope-session.spec @@ -0,0 +1,58 @@ +%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 +%global modname zope.session +%global version 3.9.2 +%global release 1 + +Summary: Client identification and sessions for Zope +Name: python-zope-session +Version: %{version} +Release: %{release}%{?dist} +Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz +License: ZPLv2.1 +Group: Development/Libraries +BuildArch: noarch +URL: http://pypi.python.org/pypi/zope.session + +BuildRequires: python2-devel +BuildRequires: python-setuptools +Requires: python-zope-filesystem +Requires: python-ZODB3 +Requires: python-zope-component +Requires: python-zope-i18nmessageid +Requires: python-zope-interface +Requires: python-zope-location +Requires: python-zope-publisher +Requires: python-zope-minmax + +%description +This package provides interfaces for client identification and session +support and their implementations for zope.publisher's request objects. + +%prep +%setup -q -n %{modname}-%{version} + +%build +python setup.py build + +%install +rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT +#rm -f $RPM_BUILD_ROOT%{python_sitelib}/zope/session/*.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES.txt README.txt +#%doc src/zope/session/*.txt +%{python_sitelib}/zope/session/ +%{python_sitelib}/%{modname}-*.egg-info +%{python_sitelib}/%{modname}-*-nspkg.pth + + +%changelog +* Fri Jun 18 2010 Robin Lee - 3.9.2-1 +- Initial packaging diff --git a/python-zope-testbrowser/F-13/python-zope-testbrowser.spec b/python-zope-testbrowser/F-13/python-zope-testbrowser.spec index 28213d4..548e8dc 100644 --- a/python-zope-testbrowser/F-13/python-zope-testbrowser.spec +++ b/python-zope-testbrowser/F-13/python-zope-testbrowser.spec @@ -19,7 +19,7 @@ BuildRequires: python2-devel BuildRequires: python-setuptools Requires: python-zope-filesystem Requires: python-mechanize > 0.2.0 -Requires: python-zope-inferface +Requires: python-zope-interface Requires: python-zope-schema Requires: pytz diff --git a/zope/F-13/zope-2.10.4-config.patch b/zope/F-13/zope-2.10.4-config.patch deleted file mode 100644 index 51b5bd7..0000000 --- a/zope/F-13/zope-2.10.4-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- skel/etc/zope.conf.in.orig 2007-08-14 00:14:05.000000000 -0600 -+++ skel/etc/zope.conf.in 2007-08-14 00:14:49.000000000 -0600 -@@ -148,6 +148,7 @@ - # - # effective-user chrism - -+effective-user zope - - # Directive: enable-product-installation - # -@@ -288,6 +289,7 @@ - # - # mime-types $INSTANCE/etc/mime.types - -+mime-types /etc/mime.types - - # Directive: structured-text-header-level - # diff --git a/zope/F-13/zope-2.10.8-configure.patch b/zope/F-13/zope-2.10.8-configure.patch deleted file mode 100644 index 75f3e22..0000000 --- a/zope/F-13/zope-2.10.8-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Zope-2.10.8-final/configure.orig Zope-2.10.8-final/configure ---- Zope-2.10.8-final/configure.orig 2009-05-25 16:43:00.000000000 -0600 -+++ Zope-2.10.8-final/configure 2009-05-25 16:43:07.000000000 -0600 -@@ -18,7 +18,7 @@ TARGET="2.4.6" - # sys.version) below in "best" to "worst" order, not including the - # target version. Up to six acceptable python versions are allowed. - # Do not include the target version number in this list! --ACCEPTABLE="2.4.5 2.4.4" -+ACCEPTABLE="2.4.5 2.4.4 2.4.3" - - # provide the executable names for all the acceptable versions - # (and the target version) below diff --git a/zope/F-13/zope-2.12.7-config.patch b/zope/F-13/zope-2.12.7-config.patch new file mode 100644 index 0000000..0d8609e --- /dev/null +++ b/zope/F-13/zope-2.12.7-config.patch @@ -0,0 +1,18 @@ +--- src/Zope2/utilities/skel/etc/zope.conf.in.orig 2010-06-18 03:01:28.325202822 +0800 ++++ src/Zope2/utilities/skel/etc/zope.conf.in 2010-06-18 03:02:44.499202147 +0800 +@@ -147,6 +147,7 @@ + # + # effective-user chrism + ++effective-user zope + + # Directive: enable-product-installation + # +@@ -287,6 +288,7 @@ + # + # mime-types $INSTANCE/etc/mime.types + ++mime-types /etc/mime.types + + # Directive: structured-text-header-level + # diff --git a/zope/F-13/zope-README.Fedora b/zope/F-13/zope-README.Fedora index aaff94f..99b46b1 100644 --- a/zope/F-13/zope-README.Fedora +++ b/zope/F-13/zope-README.Fedora @@ -1,7 +1,7 @@ ==== Concerning the Fedora package ==== A default instance has been installed in <>/lib/zope. -You can create additional instances using the mkzopeinstance.py script +You can create additional instances using the mkzopeinstance command. Add your instances to <>/sysconfig/zope to make the zopectl script aware of them. Every operation run by <>/zopectl will affect all diff --git a/zope/F-13/zope.init.in b/zope/F-13/zope.init.in index 1fd5751..f5ec6b3 100644 --- a/zope/F-13/zope.init.in +++ b/zope/F-13/zope.init.in @@ -8,6 +8,7 @@ # Source function library. . /etc/init.d/functions +. "<>/sysconfig/zope" RETVAL=0 zopectl="<>/zopectl" @@ -16,7 +17,9 @@ prog="zope" start() { echo -n $"Starting $prog: " - output=`$zopectl -u $user start 2>/dev/null` + for instance in $ZOPE_INSTANCES; do + output+=`$instance/bin/zopectl -u $user start 2>/dev/null` + done # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "started"; then @@ -36,7 +39,9 @@ start() { stop() { echo -n $"Stopping $prog: " - output=`$zopectl -u $user stop 2>/dev/null` + for instance in $ZOPE_INSTANCES; do + output+=`$instance/bin/zopectl -u $user stop 2>/dev/null` + done # the return status of zopectl is not reliable, we need to parse # its output via substring match if echo $output | grep -q "stopped"; then @@ -67,13 +72,18 @@ case "$1" in stop ;; status) - $zopectl status + for instance in $ZOPE_INSTANCES; do + $instance/bin/zopectl status + done ;; restart) restart ;; condrestart) - $zopectl status | grep -qs "program running" && restart + for instance in $ZOPE_INSTANCES; do + output+=`$instance/bin/zopectl status` + done + echo $output | grep -qs "program running" && restart ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" diff --git a/zope/F-13/zope.spec b/zope/F-13/zope.spec index 9c480da..df8deea 100644 --- a/zope/F-13/zope.spec +++ b/zope/F-13/zope.spec @@ -1,6 +1,7 @@ -%define python_minver 2.4.3 - +%define python_minver 2.6 +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%endif %define zope_user zope %define zope_group %{zope_user} @@ -14,29 +15,86 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.10.9 +Version: 2.12.7 Release: 1%{?dist} -License: ZPL +License: ZPLv2.1 Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/%{version}/Zope-%{version}-final.tgz +Source0: http://pypi.python.org/packages/source/Z/Zope2/Zope2-%{version}.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in Source2: zope.sysconfig.in -Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in -Patch0: zope-2.10.4-config.patch -Patch1: zope-2.10.8-configure.patch - -BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} -Requires: python >= %{python_minver}, libxml2-python, python-elementtree - -Requires(pre): /usr/sbin/useradd +Patch0: zope-2.12.7-config.patch + +BuildRequires: python-devel >= %{python_minver} +BuildRequires: python-setuptools +BuildRequires: python-sphinx +Requires: python-Acquisition +Requires: python-DateTime +Requires: python-ExtensionClass +Requires: python-Missing +Requires: python-MultiMapping +Requires: python-Persistence +Requires: python-Record +Requires: python-RestrictedPython +Requires: python-ThreadLock +Requires: python-ZConfig +Requires: python-ZODB3 +Requires: python-ZopeUndo +Requires: python-docutils +Requires: python-five-formlib +Requires: python-initgroups +Requires: pytz +Requires: python-setuptools +Requires: python-tempstorage +Requires: python-transaction +Requires: python-zdaemon +Requires: python-zLOG +Requires: python-zope-component +Requires: python-zope-configuration +Requires: python-zope-container +Requires: python-zope-contentprovider +Requires: python-zope-contenttype +Requires: python-zope-deferredimport +Requires: python-zope-event +Requires: python-zope-exceptions +Requires: python-zope-i18n +Requires: python-zope-i18nmessageid +Requires: python-zope-interface +Requires: python-zope-lifecycleevent +Requires: python-zope-location +Requires: python-zope-mkzeoinstance +Requires: python-zope-pagetemplate +Requires: python-zope-processlifetime +Requires: python-zope-proxy +Requires: python-zope-publisher +Requires: python-zope-schema +Requires: python-zope-security +Requires: python-zope-sendmail < 3.7.0 +Requires: python-zope-sequencesort +Requires: python-zope-site +Requires: python-zope-size +Requires: python-zope-structuredtext +Requires: python-zope-tal +Requires: python-zope-tales +Requires: python-zope-testbrowser +Requires: python-zope-testing +Requires: python-zope-traversing +Requires: python-zope-viewlet +Requires: python-zope-app-publication +Requires: python-zope-app-publisher +Requires: python-zope-app-schema +# this one is not manifested in setup.py +Requires: python-zope-app-testing + +Requires(pre): shadow-utils Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig, /sbin/service +Requires(postun): /sbin/service %description Zope is an application server framework that enables developers to quickly @@ -46,60 +104,73 @@ systems. Zope, by default, will listen on port 8080. %prep -%setup -q -n Zope-%{version}-final +%setup -q -n Zope2-%{version} %patch0 -p0 -%patch1 -p1 -chmod -x skel/import/README.txt +sed -i -e '/^#!/, 1d' src/ZPublisher/{Test,Client}.py \ + src/Products/PageTemplates/tests/run.py \ + src/Products/ZCTextIndex/tests/{wordstats,hs-tool,indexhtml}.py \ + src/Zope2/Startup/{misc/zpasswd,zopectl}.py \ + src/DocumentTemplate/release.sh \ + src/ZServer/medusa/{test/asyn_http_bench.py,http_server.py} \ + src/ZTUtils/tests/run.py src/ZPublisher/Client.py src/OFS/ndiff.py + +chmod -x src/AccessControl/securitySuite/regressionSecurity.py +chmod -x src/Zope2/utilities/skel/import/README.txt install -pm 644 %{SOURCE4} README.Fedora -install -pm 644 %{SOURCE5} skel/etc/logrotate.conf.in - +# don't include batch files +rm -f src/Zope2/utilities/skel/bin/*.bat* %build -rm -rf $RPM_BUILD_ROOT # Configure checks for it -./configure \ - --prefix=$RPM_BUILD_ROOT%{zope_home} \ -# --with-python=%{_bindir}/python -# --no-compile +env CFLAGS="$RPM_OPT_FLAGS" python setup.py build -make %{?_smp_mflags} +# make html documents +pushd doc +make html +rm -fr .build/html/{_sources,.buildinfo} +popd %install rm -rf $RPM_BUILD_ROOT +python setup.py install --root=$RPM_BUILD_ROOT \ + --install-scripts=%{_bindir} --install-lib=%{software_home} + +# add a missed namespace holder +cp -p src/Products/__init__.py $RPM_BUILD_ROOT%{software_home}/Products/ + +# delete included C source files +find $RPM_BUILD_ROOT -name '*.c' -type f -print0 | xargs -0 rm -fv # Create all required additional directories -for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \ - %{_sysconfdir}/sysconfig %{_bindir}; do +for dir in %{instance_home}/{Products,bin,var} %{_sysconfdir}/sysconfig; do install -d $RPM_BUILD_ROOT$dir done -install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/zope +install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}/zope install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope -install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/zopectl +install -D -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT%{software_home}/Zope2/utilities/skel/etc/logrotate.conf.in install -D -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate perl -pi -e 's,<>,%{_sysconfdir},g; s,<>,%{_bindir},g; s,<>,%{_localstatedir},g; s,<>,%{zope_user},g' \ - $RPM_BUILD_ROOT%{_initrddir}/zope \ + $RPM_BUILD_ROOT%{_initddir}/zope \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zope \ - $RPM_BUILD_ROOT%{_bindir}/zopectl \ $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/zope-logrotate \ - README.Fedora skel/etc/zope.conf.in + README.Fedora # Install the skel, translating paths, into the build root -%{__python} "utilities/copyzopeskel.py" \ - --sourcedir="skel" \ +%{__python} "src/Zope2/utilities/copyzopeskel.py" \ + --sourcedir="$RPM_BUILD_ROOT%{software_home}/Zope2/utilities/skel" \ --targetdir="$RPM_BUILD_ROOT%{instance_home}" \ --replace="INSTANCE_HOME:%{instance_home}" \ --replace="SOFTWARE_HOME:%{software_home}" \ --replace="ZOPE_HOME:%{zope_home}" \ --replace="PYTHON:%{__python}" \ - -# Actually copy all the other files over -make install + --replace="ZOPE_SCRIPTS:%{_bindir}" chmod 750 $RPM_BUILD_ROOT%{instance_home} @@ -115,32 +186,25 @@ done chmod 755 $RPM_BUILD_ROOT%{zope_home} -# included in %%doc -rm -rf $RPM_BUILD_ROOT%{zope_home}/doc - # write version.txt echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{software_home}/version.txt" -# write zope.pth +# write Zope2.pth install -d $RPM_BUILD_ROOT%{python_sitearch} echo "%{software_home}" > \ - "$RPM_BUILD_ROOT%{python_sitearch}/zope.pth" - -# Compile .pyc -%{__python} -c "import compileall; \ - compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ - ddir=\"%{zope_home}\", force=1)" - - + "$RPM_BUILD_ROOT%{python_sitearch}/Zope2.pth" %clean rm -rf $RPM_BUILD_ROOT %pre -%{_sbindir}/useradd -c "Zope user" -s /bin/false -r -d %{zope_home} \ - %{zope_user} 2>/dev/null || : +getent group %{zope_group} >/dev/null || groupadd -r %{zope_group} +getent passwd %{zope_user} >/dev/null || \ + useradd -r -g %{zope_group} -d %{zope_home} -s /sbin/nologin \ + -c "Zope user" %{zope_user} +exit 0 %post @@ -154,33 +218,46 @@ if [ $1 -eq 0 ]; then /sbin/chkconfig --del zope fi +%postun +if [ "$1" -ge "1" ] ; then + /sbin/service zope condrestart >/dev/null 2>&1 || : +fi %files %defattr(-, root, root, -) -%doc doc/* README.Fedora ZopePublicLicense.txt +%doc COPYRIGHT.txt LICENSE.txt README.txt doc/.build/html README.Fedora %config(noreplace) %{_sysconfdir}/sysconfig/zope -%config %{_initrddir}/zope +%{_initddir}/zope %config %{_sysconfdir}/cron.daily/zope-logrotate -%attr(0755, root, root) %{_bindir}/zopectl +%{_bindir}/zopectl +%{_bindir}/mkzeoinstance +%{_bindir}/mkzopeinstance +%{_bindir}/runzope +%{_bindir}/zpasswd %dir %{zope_home} -%{zope_home}/bin %{zope_home}/lib -%dir %{zope_home}/skel -%{zope_home}/skel/bin -%{zope_home}/skel/Extensions -%{zope_home}/skel/import -%{zope_home}/skel/log -%{zope_home}/skel/lib -%{zope_home}/skel/Products -%{zope_home}/skel/README.txt -%{zope_home}/skel/var -%config %{zope_home}/skel/etc -%attr(-, root, %{zope_group}) %{instance_home}/* -%{python_sitearch}/zope.pth +%attr(-, root, %{zope_group}) %{instance_home}/ +%{python_sitearch}/Zope2.pth %changelog +* Fri Jun 18 2010 Robin Lee - 2.12.7-1 +- Update to 2.12.7 +- License Specified to ZPLv2.1 +- Source0 URL renewed +- zope-2.10.4-config.patch and zope-2.10.8-configure.patch removed, + zope-2.12.7-config.patch added to make the same effect of + zope-2.10.4-config.patch +- BR: python-setuptools and python-sphinx added +- Add multiple requirements +- zope.zopectl.in removed +- %%pre rewritten and %%postun added following + http://fedoraproject.org/wiki/Packaging/SysVInitScript +- zope.init.in renewed +- zope.logrotate.in included in the binary package +- Don't include the batch files + * Thu Aug 6 2009 Jonathan Steffan 2.10.9-1 - Update to 2.10.9 - Fix CVE-2009-0669 (BZ#513428) diff --git a/zope/F-13/zope.zopectl.in b/zope/F-13/zope.zopectl.in deleted file mode 100644 index 7168263..0000000 --- a/zope/F-13/zope.zopectl.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -. <>/sysconfig/zope -for instance in $ZOPE_INSTANCES; do - $instance/bin/zopectl "$@" -done -- cgit