[Erp5-report] r16917 - /spec/mandriva/2007.0/erp5-zope/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Oct 9 18:39:58 CEST 2007
Author: kazuhiko
Date: Tue Oct 9 18:39:58 2007
New Revision: 16917
URL: http://svn.erp5.org?rev=16917&view=rev
Log:
version up to Zope-2.8
Added:
spec/mandriva/2007.0/erp5-zope/Zope-2.8.0-final-aq_dynamic.patch.bz2 (with props)
spec/mandriva/2007.0/erp5-zope/skel-for-rpm.tar.bz2 (with props)
spec/mandriva/2007.0/erp5-zope/zope-book.tar.bz2 (with props)
spec/mandriva/2007.0/erp5-zope/zope-devguide.tar.bz2 (with props)
Modified:
spec/mandriva/2007.0/erp5-zope/erp5-zope.spec
Added: spec/mandriva/2007.0/erp5-zope/Zope-2.8.0-final-aq_dynamic.patch.bz2
URL: http://svn.erp5.org/spec/mandriva/2007.0/erp5-zope/Zope-2.8.0-final-aq_dynamic.patch.bz2?rev=16917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: spec/mandriva/2007.0/erp5-zope/Zope-2.8.0-final-aq_dynamic.patch.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: spec/mandriva/2007.0/erp5-zope/erp5-zope.spec
URL: http://svn.erp5.org/spec/mandriva/2007.0/erp5-zope/erp5-zope.spec?rev=16917&r1=16916&r2=16917&view=diff
==============================================================================
--- spec/mandriva/2007.0/erp5-zope/erp5-zope.spec (original)
+++ spec/mandriva/2007.0/erp5-zope/erp5-zope.spec Tue Oct 9 18:39:58 2007
@@ -1,6 +1,6 @@
-%define realVersion 2.7.8-final
+%define realVersion 2.8.9.1-final
%define name zope
-%define release 8
+%define release 1
%define version %(echo %{realVersion} | sed -e's/-/./g')
%define sVersion %(echo %{realVersion} | cut -d- -f1)
@@ -13,16 +13,20 @@
License: Zope Public License (ZPL)
Group: System/Servers
URL: http://www.zope.org
-Source0: http://zope.org/Products/Zope/%{sVersion}/Zope-%{realVersion}.tar.bz2
-Source1: skel.tar.bz2
-Source2: http://www.zope.org/Members/michel/ZB/ZopeBook.tar.bz2
-Source3: README.install.urpmi.zope
-Patch0: Zope-2.7.2-rc1-aq_dynamic.patch.bz2
+Source0: http://zope.org/Products/Zope/%{sVersion}/Zope-%{realVersion}.tgz
+Source1: skel-for-rpm.tar.bz2
+Source2: README.install.urpmi.zope
+Source10: zope-book.tar.bz2
+Source11: zope-devguide.tar.bz2
+Patch0: Zope-2.8.0-final-aq_dynamic.patch.bz2
Requires: python >= 2.3.3
BuildRequires: libpython-devel >= 2.3.3
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
Epoch: 1
Provides: zope = %{?Epoch:%Epoch-}%{version}
+# zope-2.8 includes the following products
+Provides: zope-ZopeTestCase, zope-BTreeFolder2, zope-VerboseSecurity
+Obsoletes: zope-ZopeTestCase, zope-BTreeFolder2, zope-VerboseSecurity
%define python /usr/bin/python
@@ -36,6 +40,7 @@
%define zopectl /usr/bin/zopectl
%define runzope /usr/bin/runzope
%define zopeuser zope
+%define service zope
%description
Zope is an open source application server for building content managements,
@@ -48,18 +53,19 @@
make ERP5 working well.
%prep
-%setup -q -n Zope-%{realVersion}
+%setup -q -n Zope-%{realVersion} -a 1 -a 10 -a 11
%patch0 -p1
-# Add skel
-rm -rf skel
-tar xvjf %{SOURCE1}
-#rm skel/var/log/zope/README.txt skel/var/run/zope/README.txt
-
-# Prepare doc (Zope Book)
-tar xjf %{SOURCE2}
-
+# remove needless executable permission
+find doc lib skel/import import -type f -perm /111 -exec chmod -x {} \;
+
+find lib/python -type f -and \( -name 'Setup' -or -name '.cvsignore' \) \
+ -exec rm -f \{\} \;
+find -name "Win32" | xargs rm -rf
+rm -f ZServer/medusa/monitor_client_win32.py
+
+cp -p %{SOURCE2} README.install.urpmi
%build
mkdir -p build
@@ -71,38 +77,10 @@
make build
popd
-# process the skel directory into the buildroot
-python << EOF
-import py_compile, os
-files = os.popen("find . -name '*.py'").readlines()
-for file in files:
- file = file.strip()
- py_compile.compile(file, file+"o", "%{zopehome}/"+file)
- py_compile.compile(file, file+"c", "%{zopehome}/"+file)
-EOF
-
-# XXX: next release...
-#env CFLAGS="$RPM_OPT_FLAGS" /usr/bin/python setup.py build
-#/usr/bin/python setup.py install --root=$RPM_BUILD_ROOT \
-# --record=INSTALLED_FILES
-
-## Clean sources
-#find -type d -name "tests" | xargs rm -rf
-find lib/python -type f -and \( -name 'Setup' -or -name '.cvsignore' \) \
- -exec rm -f \{\} \;
-#find -type f -and \( -name '*.c' -or -name '*.h' -or -name 'Makefile*' \) \
-# -exec rm -f \{\} \;
-find -name "Win32" | xargs rm -rf
-rm -f ZServer/medusa/monitor_client_win32.py
-
-# Has a bogus #!/usr/local/bin/python1.4 that confuses RPM
-rm -f ZServer/medusa/test/asyn_http_bench.py
-
-cp %{SOURCE3} README.install.urpmi
-
%install
+%{__rm} -rf %{buildroot}
%{python} "utilities/copyzopeskel.py" \
- --sourcedir="skel" \
+ --sourcedir="skel-for-rpm" \
--targetdir="%{buildroot}" \
--replace="INSTANCE_HOME:%{instancehome}" \
--replace="CLIENT_HOME:%{clienthome}" \
@@ -115,36 +93,15 @@
--replace="ZOPECTL:%{zopectl}" \
--replace="RUNZOPE:%{runzope}"
-#perl -pi -e "s|data_dir\s+=\s+.*?join\(INSTANCE_HOME, 'var'\)|data_dir=INSTANCE_HOME|" lib/python/Globals.py
-
-
pushd build
make install
popd
-
-#rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}/zope/lib/python} \
-# $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/log,/var/lib/zope}
-#
-#cp -a lib/python/* $RPM_BUILD_ROOT%{_libdir}/zope/lib/python
-#cp -a ZServer/ utilities/ import/ $RPM_BUILD_ROOT%{_libdir}/zope
-#find $RPM_BUILD_ROOT%{_libdir}/zope -type f -name '*.py' -or -name '*.txt' \
-# | xargs -r rm -f
-#cp -a ZServer/medusa/test/* $RPM_BUILD_ROOT%{_libdir}/zope/ZServer/medusa/test/
-#
-#install zpasswd.py $RPM_BUILD_ROOT%{_bindir}/zpasswd
-#install z2.py $RPM_BUILD_ROOT%{_libdir}/zope
-#install %{SOURCE8} $RPM_BUILD_ROOT%{_sbindir}/zope-zserver
-#install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/zope
-#install var/Data.fs $RPM_BUILD_ROOT/var/lib/zope/Data.fs
-
-mkdir -p $RPM_BUILD_ROOT/var/log/zope
-touch $RPM_BUILD_ROOT/var/log/zope/event.log
-touch $RPM_BUILD_ROOT/var/log/zope/Z2.log
-
+%py_compile %{buildroot}%{softwarehome}
+touch %{buildroot}%{loghome}/event.log
+touch %{buildroot}%{loghome}/Z2.log
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre
%_pre_useradd zope /var/lib/zope /bin/false
@@ -153,24 +110,6 @@
%_post_service zope
/sbin/chkconfig --add zope
-# disable this feature : it creates problem during update and
-# is confusing for somebody who don't care about installation message
-# zope display a how to create an administrative user if it doesn't exit
-# README.install.urpmi display the rest of the text
-
-# # write a 10 digit random default admin password into acl_users
-# passwd=`head -c4 /dev/urandom | od -tu4 -N4 | sed -ne '1s/.* //p'`
-# %{zopectl} adduser admin $passwd
-# # inform the user of the default username/password combo and port
-# echo
-# echo A Zope instance has been installed. Run it via
-# echo \"/etc/rc.d/init.d/zope start\". Log in via a browser on port 9080.
-# echo
-# echo Zope has default administrative username/password combination. The
-# echo "administrative username is \"admin\" and the password is \"$passwd\"."
-# echo Please remember this so you are able to log in for the first time.
-# echo
-
%preun
%_preun_service zope
@@ -178,37 +117,21 @@
%_postun_userdel zope
%files
-%defattr(0644,root,root,755)
-%dir %{zopehome}
-%{zopehome}/doc
-%{zopehome}/import
-%{zopehome}/lib
-%{zopehome}/skel
-
-%attr(755,root,root)/usr/bin/runzope
-%attr(755,root,root)/usr/bin/zopectl
-%attr(755,root,root) %{zopehome}/bin/*
-%attr(755,root,root) %config(noreplace) /etc/rc.d/init.d/zope
-%config(noreplace) /etc/zope.conf
-%config(noreplace) /etc/logrotate.d/zope
-
-%attr(770, %{zopeuser}, %{zopeuser}) %config(noreplace) %verify(not md5 size mtime) %{instancehome}
-%attr(755, %{zopeuser}, %{zopeuser}) %dir /var/run/zope
-%attr(770, %{zopeuser}, %{zopeuser}) %dir /var/log/zope
-%ghost /var/log/zope/Z2.log
-%ghost /var/log/zope/event.log
+%defattr(-,root,root,755)
+%{zopehome}
+%{runzope}
+%{zopectl}
+%config(noreplace) /etc/rc.d/init.d/%{service}
+%config(noreplace) %{configfile}
+%config(noreplace) /etc/logrotate.d/%{service}
+
+%attr(-,%{zopeuser},%{zopeuser}) %config(noreplace) %verify(not md5 size mtime) %{instancehome}
+%attr(-,%{zopeuser},%{zopeuser}) %dir %{statehome}
+%attr(-,%{zopeuser},%{zopeuser}) %dir %{loghome}
+%ghost %{loghome}/Z2.log
+%ghost %{loghome}/event.log
%doc README.install.urpmi
-
-#%defattr(644,root,root,755)
-#%config(noreplace) %attr(755,root,root) /etc/rc.d/init.d/zope
-#%attr(755,root,root) %{_bindir}/*
-#%attr(755,root,root) %{_sbindir}/*
-#%{_libdir}/zope
-#%attr(1771,root,zope) %dir /var/lib/zope
-#%attr(660,root,zope) %config(noreplace) %verify(not md5 size mtime) /var/lib/zope/*
-##%attr(640,root,root) %ghost /var/log/zope
-
##############################################################################
@@ -223,13 +146,13 @@
high-performance, integrated object database.
%files docs
-%defattr(644, root, root, 755)
-%doc ZopeBook doc
-
-
-##############################################################################
+%defattr(-,root,root,755)
+%doc doc zope-book zope-devguide
%changelog
+* Wed Sep 5 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.8.9.1.final-1mdv2007.0
+- upgrade to Zope-2.8
+
* Tue Jan 23 2007 Kevin Deldycke <kevin at nexedi.com> 2.7.8-8mdv2007.0
- Generate empty log files
@@ -281,43 +204,43 @@
- Bump to 2.7.2rc1
- Patch Acquistion to support _aq_dynamic
-* Sat Feb 07 2004 St�ane Fermigier <sf at nuxeo.com> 2.7.0rc2-1mdk
+* Sat Feb 07 2004 Stéfane Fermigier <sf at nuxeo.com> 2.7.0rc2-1mdk
- Bump to Zope 2.7.0rc2
-* Sun Jan 11 2004 St�ane Fermigier <sf at nuxeo.com> 2.7.0b4-1mdk
+* Sun Jan 11 2004 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b4-1mdk
- Bump to Zope 2.7.0b4
-* Sun Sep 14 2003 St�ane Fermigier <sf at nuxeo.com> 2.7.0b2-1pyp
+* Sun Sep 14 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b2-1pyp
- Update to Zope 2.7.0b2
-* Fri Aug 15 2003 St�ane Fermigier <sf at nuxeo.com> 2.7.0b1-3pyp
+* Fri Aug 15 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-3pyp
- Update for Python 2.3
-* Sat Aug 9 2003 St�ane Fermigier <sf at nuxeo.com> 2.7.0b1-2pyp
+* Sat Aug 9 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-2pyp
- Added copyright notice
- Compile to .pyc as well as to .pyo
-* Sat Jul 26 2003 St�ane Fermigier <sf at nuxeo.com> 2.7.0b1-1mdk
+* Sat Jul 26 2003 Stéfane Fermigier <sf at nuxeo.com> 2.7.0b1-1mdk
- Update to Zope 2.7.0b1
- Merged stuff from the Zope.org RPM
-* Sat May 3 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-6mdk
+* Sat May 3 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-6mdk
- Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
-* Mon Mar 24 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-5mdk
+* Mon Mar 24 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-5mdk
- Moved python stuff from /usr/lib/zope to /usr/lib/zope/lib/python
-* Tue Feb 25 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-4mdk
+* Tue Feb 25 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-4mdk
- changes by Frederic Lepied
- fixed dependency problem between zope-docs and zope
- removed unused directive
-* Sun Feb 23 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-3mdk
+* Sun Feb 23 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-3mdk
- fix bugs
-* Sat Feb 22 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-2mdk
+* Sat Feb 22 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-2mdk
- dont ship tests
- separate docs package, including the Zope Book.
-* Sat Feb 22 2003 St�ane Fermigier <sf at nuxeo.com> 2.6.1-1mdk
+* Sat Feb 22 2003 Stéfane Fermigier <sf at nuxeo.com> 2.6.1-1mdk
- First release starting from PLD RPM.
Added: spec/mandriva/2007.0/erp5-zope/skel-for-rpm.tar.bz2
URL: http://svn.erp5.org/spec/mandriva/2007.0/erp5-zope/skel-for-rpm.tar.bz2?rev=16917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: spec/mandriva/2007.0/erp5-zope/skel-for-rpm.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: spec/mandriva/2007.0/erp5-zope/zope-book.tar.bz2
URL: http://svn.erp5.org/spec/mandriva/2007.0/erp5-zope/zope-book.tar.bz2?rev=16917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: spec/mandriva/2007.0/erp5-zope/zope-book.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: spec/mandriva/2007.0/erp5-zope/zope-devguide.tar.bz2
URL: http://svn.erp5.org/spec/mandriva/2007.0/erp5-zope/zope-devguide.tar.bz2?rev=16917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: spec/mandriva/2007.0/erp5-zope/zope-devguide.tar.bz2
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Erp5-report
mailing list