dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-Zope-2.9.4-final.tgz

.gitignore

@@ -0,0 +1 @@
+Zope-2.9.7-final.tgz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: zope
-# $Id$
-NAME := zope
-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
-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)

sources

@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+f7d900c00fe95d4cce0bc5854bc842b4  Zope-2.9.7-final.tgz

zope-2.8.3-pythonwarning.patch

@@ -1,13 +0,0 @@
---- ./lib/python/App/dtml/zope_quick_start.dtml.pythonwarning	2005-10-25 15:23:22.000000000 +0200
-+++ ./lib/python/App/dtml/zope_quick_start.dtml	2005-10-25 15:35:55.000000000 +0200
-@@ -134,5 +134,10 @@
- 
- </ul>
- 
-+<p style="color: red; font-weight: bold">
-+WARNING: you are running Zope 2.8.X with python 2.4.X, this is not a supported
-+combination. Don't file bugreports or ask for support on zope.org.
-+</p>
-+
- </body>
- </html>

zope.configure-2.9.5.patch

@@ -0,0 +1,11 @@
+--- Zope-2.9.5-final.orig/configure     2006-10-02 09:53:36.000000000 -0600
++++ Zope-2.9.5-final/configure  2006-11-22 14:28:48.000000000 -0700
+@@ -18,7 +18,7 @@
+ # 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.2"
++ACCEPTABLE="2.4.2 2.4.4"
+ 
+ # provide the executable names for all the acceptable versions
+ # (and the target version) below

zope.spec

@@ -1,5 +1,7 @@
 %define python_minver 2.4.2
 
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 %define zope_user      zope
 %define zope_group     %{zope_user}
 
@@ -12,13 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
+Version: 2.9.7
 Release: 2%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.7/Zope-2.9.7-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -27,8 +28,9 @@ Source3: zope.zopectl.in
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
+#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
+#Patch1:  zope.configure-2.9.5.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +48,12 @@ systems.
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
-
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
+#%patch1 -p1
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -81,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 # Create all required additional directories
 for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \
     %{_sysconfdir}/sysconfig %{_bindir}; do
-    mkdir -p $RPM_BUILD_ROOT$dir
+    install -d $RPM_BUILD_ROOT$dir
 done
 
 
@@ -124,6 +120,11 @@ rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
 
+# write zope.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}\", \
@@ -183,10 +184,31 @@ fi
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt
 %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var
 %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
-
+%{python_sitearch}/zope.pth
 
 
 %changelog
+* Wed May 23 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-2
+- Added zope.pth to fix misc. zope scripts including some zeo stuff
+
+* Mon Apr 2 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.7-1
+- Removed hotfix 20070320
+- Updated to 2.9.7
+- Removed no longer needed patch for acceptable python version
+
+* Wed Mar 21 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-2
+- Added hotfix 20070320 (#233378)
+
+* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
+- Updated to 2.9.6 added Five back into Zope (#221252)
+
+* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
+- Updated to 2.9.5 and removed not needed patches
+
+* Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
+- Removed Five from zope package (plone 2.5.1 now provides the needed
+  version.)
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.4-2
 - fix path on x86_64