[Cluster-devel] conga ./.cvsignore ./conga.spec.in.in ./downlo ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-23 22:32:29

Modified files:
	.              : .cvsignore conga.spec.in.in download_files 
	luci/site/luci/Extensions: ModelBuilder.py 

Log message:
	use the latest version of plone (2.5.2-1)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/.cvsignore.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.66&r2=1.67
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ModelBuilder.py.diff?cvsroot=cluster&r1=1.16&r2=1.17

--- conga/.cvsignore	2006/09/25 17:35:13	1.3
+++ conga/.cvsignore	2007/01/23 22:32:29	1.4
@@ -1,4 +1,5 @@
 Plone-2.5.tar.gz
+Plone-2.5.2-1.tar.gz
 Zope-2.9.3.tgz
 Zope-2.9.4-final.tgz
 conga.spec.in
--- conga/conga.spec.in.in	2007/01/10 23:52:45	1.66
+++ conga/conga.spec.in.in	2007/01/23 22:32:29	1.67
@@ -31,7 +31,7 @@
 %if "%{include_zope_and_plone}" == "yes"
 Source1: @@ZOPE_ARCHIVE_TAR@@
 Source2: @@PLONE_ARCHIVE_TAR@@
-Patch2:  Plone-2.5_CMFPlone.patch
+Patch2: Plone-2.5.2-1_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
--- conga/download_files	2006/09/25 17:35:13	1.3
+++ conga/download_files	2007/01/23 22:32:29	1.4
@@ -15,9 +15,10 @@
 
 
 
-PLONE_ARCHIVE=Plone-2.5
-PLONE_ARCHIVE_TAR=Plone-2.5.tar.gz
-PLONE_MD5SUM=0a385a1a4afbf940bb4e094ce5dcb583
-PLONE_URLs="http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \
-	    http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \
-	    http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz"
+PLONE_ARCHIVE=Plone-2.5.2-1
+PLONE_ARCHIVE_TAR=Plone-2.5.2-1.tar.gz
+PLONE_MD5SUM=b4891a3f11a0eacb13b234d530ba9af1
+PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.2-1.tar.gz \
+	http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \
+	    http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \
+	    http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz"
--- conga/luci/site/luci/Extensions/ModelBuilder.py	2007/01/23 14:05:25	1.16
+++ conga/luci/site/luci/Extensions/ModelBuilder.py	2007/01/23 22:32:29	1.17
@@ -42,7 +42,7 @@
 from Heuristic import Heuristic
 from GeneralError import GeneralError
 from clui_constants import *
-import MessageLibrary
+
 TAGNAMES={ 'cluster':Cluster,
            'clusternodes':ClusterNodes,
            'clusternode':ClusterNode,