From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 25 Mar 2008 17:12:19 -0000
Subject: [Cluster-devel] conga conga.spec.in.in download_files Plone-2. ...
Message-ID: <20080325171219.11530.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-03-25 17:12:18

Modified files:
	.              : conga.spec.in.in download_files 
Added files:
	.              : Plone-2.5.5-CMFPlone.patch 
Removed files:
	.              : Plone-2.5.3-final_CMFPlone.patch 

Log message:
	Upgrade Plone to the version we use in RHEL5

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.5-CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=NONE&r2=1.1.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.20&r2=1.67.2.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.5&r2=1.5.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.3-final_CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.2.1&r2=NONE

/cvs/cluster/conga/Plone-2.5.5-CMFPlone.patch,v  -->  standard output
revision 1.1.4.1
--- conga/Plone-2.5.5-CMFPlone.patch
+++ -	2008-03-25 17:12:18.528316000 +0000
@@ -0,0 +1,111 @@
+diff -ur Plone-2.5.5.orig/CMFPlone/exportimport/configure.zcml Plone-2.5.5/CMFPlone/exportimport/configure.zcml
+--- Plone-2.5.5.orig/CMFPlone/exportimport/configure.zcml	2007-12-04 22:33:37.000000000 -0500
++++ Plone-2.5.5/CMFPlone/exportimport/configure.zcml	2008-01-17 13:15:43.000000000 -0500
+@@ -32,12 +32,6 @@
+      />
+ 
+   <adapter
+-     factory="Products.CMFCore.exportimport.content.StructureFolderWalkingAdapter"
+-     provides="Products.GenericSetup.interfaces.IFilesystemImporter"
+-     for="Products.ATContentTypes.interface.IATContentType"
+-     />
+-
+-  <adapter
+      factory=".propertiestool.SimpleItemWithPropertiesXMLAdapter"
+      provides="Products.GenericSetup.interfaces.IBody"
+      for="Products.CMFCore.interfaces.IMemberDataTool
+@@ -51,19 +45,6 @@
+           Products.GenericSetup.interfaces.ISetupEnviron"
+      />
+ 
+-  <!-- Mark ATCT objects as IDAVAware so CMFSetup can export/import them -->
+-  <five:implements
+-     class="Products.ATContentTypes.content.document.ATDocument"
+-     interface="Products.GenericSetup.interfaces.IDAVAware"
+-     />
+-
+-  <!-- XXX: Temporarily disable ATTopic exporting until we have an
+-       actual exporter or Marshaller -->
+-  <five:implements
+-     class="Products.ATContentTypes.content.topic.ATTopic"
+-     interface="Products.CMFPlone.exportimport.content.IDisabledExport"
+-     />
+-
+   <adapter
+      factory=".content.NullExporterAdapter"
+      provides="Products.GenericSetup.interfaces.IFilesystemExporter"
+diff -ur Plone-2.5.5.orig/CMFPlone/MembershipTool.py Plone-2.5.5/CMFPlone/MembershipTool.py
+--- Plone-2.5.5.orig/CMFPlone/MembershipTool.py	2007-12-04 22:33:37.000000000 -0500
++++ Plone-2.5.5/CMFPlone/MembershipTool.py	2008-01-17 13:15:43.000000000 -0500
+@@ -1,4 +1,3 @@
+-import PIL
+ from cStringIO import StringIO
+ from DateTime import DateTime
+ from Products.CMFCore.utils import getToolByName, _checkPermission
+@@ -589,6 +588,7 @@
+             if portrait_data == '':
+                 continue
+             try:
++                import PIL
+                 img = PIL.Image.open(StringIO(portrait_data))
+             except ConflictError:
+                 pass
+diff -ur Plone-2.5.5.orig/CMFPlone/setup/dependencies.py Plone-2.5.5/CMFPlone/setup/dependencies.py
+--- Plone-2.5.5.orig/CMFPlone/setup/dependencies.py	2007-12-04 22:33:37.000000000 -0500
++++ Plone-2.5.5/CMFPlone/setup/dependencies.py	2008-01-17 13:16:49.000000000 -0500
+@@ -107,7 +107,8 @@
+ except ImportError:
+     log(("PIL not found. Plone needs PIL 1.1.5 or newer. "
+          "Please download it from http://www.pythonware.com/products/pil/ or "
+-         "http://effbot.org/downloads/#Imaging"))
++         "http://effbot.org/downloads/#Imaging"),
++         severity=logging.INFO, optional=1)
+     raise ImportError, 'PIL is required'
+ 
+ try:
+diff -ur Plone-2.5.5.orig/CMFPlone/utils.py Plone-2.5.5/CMFPlone/utils.py
+--- Plone-2.5.5.orig/CMFPlone/utils.py	2007-12-04 22:33:38.000000000 -0500
++++ Plone-2.5.5/CMFPlone/utils.py	2008-01-17 13:15:43.000000000 -0500
+@@ -3,8 +3,6 @@
+ from os.path import join, abspath, split
+ from cStringIO import StringIO
+ 
+-from PIL import Image
+-
+ import zope.interface
+ from zope.interface import implementedBy
+ from zope.component import getMultiAdapter
+@@ -41,15 +39,6 @@
+ DANGEROUS_CHARS_REGEX = re.compile(r"[?&/:\\#]+")
+ EXTRA_DASHES_REGEX = re.compile(r"(^\-+)|(\-+$)")
+ 
+-# Settings for member image resize quality
+-PIL_SCALING_ALGO = Image.ANTIALIAS
+-PIL_QUALITY = 88
+-MEMBER_IMAGE_SCALE = (75, 100)
+-IMAGE_SCALE_PARAMS = {'scale': MEMBER_IMAGE_SCALE,
+-                      'quality': PIL_QUALITY,
+-                      'algorithm': PIL_SCALING_ALGO,
+-                      'default_format': 'PNG'}
+-
+ _marker = []
+ 
+ class BrowserView(BaseView):
+@@ -632,6 +621,17 @@
+     return security
+ 
+ def scale_image(image_file, max_size=None, default_format=None):
++    from PIL import Image
++
++    # Settings for member image resize quality
++    PIL_SCALING_ALGO = Image.ANTIALIAS
++    PIL_QUALITY = 88
++    MEMBER_IMAGE_SCALE = (75, 100)
++    IMAGE_SCALE_PARAMS = {'scale': MEMBER_IMAGE_SCALE,
++                          'quality': PIL_QUALITY,
++                          'algorithm': PIL_SCALING_ALGO,
++                          'default_format': 'PNG'}
++
+     """Scales an image down to@most max_size preserving aspect ratio
+     from an input file
+ 
--- conga/conga.spec.in.in	2007/10/20 01:49:06	1.67.2.20
+++ conga/conga.spec.in.in	2008/03/25 17:12:18	1.67.2.21
@@ -32,14 +32,13 @@
 Source1: @@ZOPE_ARCHIVE_TAR@@
 Source3: @@ZOPE_FIVE_ARCHIVE_TAR@@
 Source2: @@PLONE_ARCHIVE_TAR@@
-Patch2: Plone-2.5.3-final_CMFPlone.patch
+Patch2: Plone-2.5.5-CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch: ppc64
 BuildRequires: python-devel >= 2.3.4
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-#BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 
@@ -319,6 +318,9 @@
 
 
 %changelog
+* Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-1
+- Backport fixes from RHEL5
+
 * Fri Oct 19 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-3
 - Fix bz340101 (Storage redirection after probe does not work on WinXP with FF2)
 - Resolves: bz340101
--- conga/download_files	2008/03/25 01:27:09	1.5.2.5
+++ conga/download_files	2008/03/25 17:12:18	1.5.2.6
@@ -13,10 +13,7 @@
 ZOPE_FIVE_URLs="http://codespeak.net/z3/five/release/Five-1.2.6.tgz"
 
 
-PLONE_ARCHIVE=Plone-2.5.3-final
-PLONE_ARCHIVE_TAR=Plone-2.5.3-final.tar.gz
-PLONE_SHA512SUM=ddb712e3e5da9c94ae4bfea9d84c700cf5a2a19631537e912b0d278021b964fe4510557fe0dbc93b9cb8bd5446385b0ff7c3a7ca0a352c938c4007a12b819cbf
-PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.3-final.tar.gz \
-	http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
-	http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
-	http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz"
+PLONE_ARCHIVE=Plone-2.5.5
+PLONE_ARCHIVE_TAR=Plone-2.5.5.tar.gz
+PLONE_SHA512SUM=6997f9d0e21d683f2c6c9f9cb3ded41fa7fce84706e98aa534d2b5638051bf694503c9623866c50ce5d3ef27da54a720209fb79d656dfedd97b439c94055b28e
+PLONE_URLs="https://launchpad.net/plone/2.5/2.5.5/+download/Plone-2.5.5.tar.gz"