[Cluster-devel] conga ./autogen.sh ./conga.spec.in.in ./downlo ...

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	kupcevic at sourceware.org	2007-02-02 18:22:43

Modified files:
	.              : autogen.sh conga.spec.in.in download_files 
	luci/site/luci/var: Data.fs 

Log message:
	Downgrade zope so it runs on python 2.3.4

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5&r2=1.5.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67&r2=1.67.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5&r2=1.5.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.20&r2=1.20.2.1

--- conga/autogen.sh	2006/08/16 03:08:43	1.5
+++ conga/autogen.sh	2007/02/02 18:22:41	1.5.4.1
@@ -78,6 +78,10 @@
 	$ZOPE_MD5SUM \
 	$ZOPE_URLs
     get_and_verify_archive \
+	$ZOPE_FIVE_ARCHIVE_TAR \
+	$ZOPE_FIVE_MD5SUM \
+	$ZOPE_FIVE_URLs
+    get_and_verify_archive \
 	$PLONE_ARCHIVE_TAR \
 	$PLONE_MD5SUM \
 	$PLONE_URLs
@@ -93,6 +97,8 @@
     | sed -e s/@@INCLUDE_ZOPE_AND_PLONE@@/$INCLUDE_ZOPE_PLONE/g \
     | sed -e s/@@ZOPE_ARCHIVE@@/$ZOPE_ARCHIVE/g \
     | sed -e s/@@ZOPE_ARCHIVE_TAR@@/$ZOPE_ARCHIVE_TAR/g \
+    | sed -e s/@@ZOPE_FIVE_ARCHIVE@@/$ZOPE_FIVE_ARCHIVE/g \
+    | sed -e s/@@ZOPE_FIVE_ARCHIVE_TAR@@/$ZOPE_FIVE_ARCHIVE_TAR/g \
     | sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
     | sed -e s/@@PLONE_ARCHIVE_TAR@@/$PLONE_ARCHIVE_TAR/g \
     > conga.spec
--- conga/conga.spec.in.in	2007/01/23 22:32:29	1.67
+++ conga/conga.spec.in.in	2007/02/02 18:22:41	1.67.2.1
@@ -30,15 +30,14 @@
 Source0: %{name}-%{version}.tar.gz
 %if "%{include_zope_and_plone}" == "yes"
 Source1: @@ZOPE_ARCHIVE_TAR@@
+Source3: @@ZOPE_FIVE_ARCHIVE_TAR@@
 Source2: @@PLONE_ARCHIVE_TAR@@
 Patch2: Plone-2.5.2-1_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-%if "%{include_zope_and_plone}" == "yes"
-BuildRequires: python-devel >= 2.4.1
-%endif
+BuildRequires: python-devel >= 2.3.4
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 #BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
@@ -57,6 +56,10 @@
 # Zope
 %setup -q -T -D -a 1
 ln -s ../@@ZOPE_ARCHIVE@@ luci/zope
+# Zope's Five
+%setup -q -T -D -a 3
+rm -rf luci/zope/lib/python/Products/Five
+mv @@ZOPE_FIVE_ARCHIVE@@ luci/zope/lib/python/Products/Five
 # Plone
 %setup -q -T -D -a 2
 ln -s ../@@PLONE_ARCHIVE@@ luci/plone
@@ -93,13 +96,13 @@
 Summary: Remote Management System - Management Station
 
 Requires: chkconfig initscripts
+Requires: python >= 2.3.4
 %if "%{include_zope_and_plone}" == "yes"
-Requires: python >= 2.4.1
 Provides: config(luci) = %{version}-%{release}
+# don't provide zope internals
 AutoProv: no
 %else
 AutoProv: yes
-Requires: python
 Requires: zope
 Requires: plone >= 2.5
 %endif
--- conga/download_files	2007/01/29 16:56:50	1.5
+++ conga/download_files	2007/02/02 18:22:41	1.5.2.1
@@ -2,17 +2,16 @@
 # URLs is a space delimited list of urls to download from
 
 
-#ZOPE_ARCHIVE=Zope-2.9.3
-#ZOPE_ARCHIVE_TAR=Zope-2.9.3.tgz
-#ZOPE_MD5SUM=4e8b4e076cadd6eb62dd4513748cb9f9
-#ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.3/Zope-2.9.3.tgz"
+ZOPE_ARCHIVE=Zope-2.8.8-final
+ZOPE_ARCHIVE_TAR=Zope-2.8.8-final.tgz
+ZOPE_MD5SUM=6deaf23f8a77a1d6f0be43864cff9b54
+ZOPE_URLs="http://www.zope.org/Products/Zope/2.8.8/Zope-2.8.8-final.tgz"
 
 
-ZOPE_ARCHIVE=Zope-2.9.6-final
-ZOPE_ARCHIVE_TAR=Zope-2.9.6-final.tgz
-ZOPE_MD5SUM=a87008a9e78248072ea5908e1006b269
-ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.6/Zope-2.9.6-final.tgz"
-
+ZOPE_FIVE_ARCHIVE=Five
+ZOPE_FIVE_ARCHIVE_TAR=Five-1.2.6.tgz
+ZOPE_FIVE_MD5SUM=f9f1e4f0e1b062e5a81fef6db9ede1a8
+ZOPE_FIVE_URLs="http://codespeak.net/z3/five/release/Five-1.2.6.tgz"
 
 
 PLONE_ARCHIVE=Plone-2.5.2-1
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/01/17 17:34:13	1.20 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2007/02/02 18:22:41	1.20.2.1 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed