FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Cluster Development

 
 
LinkBack Thread Tools
 
Old 01-17-2008, 05:45 PM
 
Default conga ./download_files ./conga.spec.in.in luci ...

CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe@sourceware.org 2008-01-17 18:45:11

Modified files:
. : download_files conga.spec.in.in
luci/conga_ssl : setup.py
luci/site/luci/Extensions: storage_adapters.py
Added files:
. : Plone-2.5.5-CMFPlone.patch

Log message:
Housekeeping, sync up plone

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.5-CMFPlone.patch.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&r1=1.10&r2=1.1 1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.93&r2=1 .94
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/conga_ssl/setup.py.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/storage_adapters.py.diff?cvsroot=cluster&r1=1.13&r 2=1.14

/cvs/cluster/conga/Plone-2.5.5-CMFPlone.patch,v --> standard output
revision 1.1
--- conga/Plone-2.5.5-CMFPlone.patch
+++ - 2008-01-17 18:45:12.171952000 +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.Str uctureFolderWalkingAdapter"
+- provides="Products.GenericSetup.interfaces.IFilesy stemImporter"
+- for="Products.ATContentTypes.interface.IATContentT ype"
+- />
+-
+- <adapter
+ factory=".propertiestool.SimpleItemWithPropertiesX MLAdapter"
+ 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.AT Document"
+- interface="Products.GenericSetup.interfaces.IDAVAw are"
+- />
+-
+- <!-- XXX: Temporarily disable ATTopic exporting until we have an
+- actual exporter or Marshaller -->
+- <five:implements
+- class="Products.ATContentTypes.content.topic.ATTop ic"
+- interface="Products.CMFPlone.exportimport.content. IDisabledExport"
+- />
+-
+ <adapter
+ factory=".content.NullExporterAdapter"
+ provides="Products.GenericSetup.interfaces.IFilesy stemExporter"
+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 at most max_size preserving aspect ratio
+ from an input file
+
--- conga/download_files 2007/09/20 06:22:45 1.10
+++ conga/download_files 2008/01/17 18:45:10 1.11
@@ -6,10 +6,7 @@
ZOPE_SHA512SUM=8fb9cf2e29ad6ee262ee397534ef4501b95 21db49cdb33e9edc1d502ed2ee071ceef8efbc8e5216dd5e01 76d33a6c56e38bc2645761b2f7f93249aa68f82f541
ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz"

-PLONE_ARCHIVE=Plone-2.5.3-final
-PLONE_ARCHIVE_TAR=Plone-2.5.3-final.tar.gz
-PLONE_SHA512SUM=ddb712e3e5da9c94ae4bfea9d84c700cf5 a2a19631537e912b0d278021b964fe4510557fe0dbc93b9cb8 bd5446385b0ff7c3a7ca0a352c938c4007a12b819cbf
-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=6997f9d0e21d683f2c6c9f9cb3ded41fa 7fce84706e98aa534d2b5638051bf694503c9623866c50ce5d 3ef27da54a720209fb79d656dfedd97b439c94055b28e
+PLONE_URLs="https://launchpad.net/plone/2.5/2.5.5/+download/Plone-2.5.5.tar.gz"
--- conga/conga.spec.in.in 2008/01/15 04:41:41 1.93
+++ conga/conga.spec.in.in 2008/01/17 18:45:10 1.94
@@ -27,7 +27,7 @@
%if "%{include_zope_and_plone}" == "yes"
Source1: @@ZOPE_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)

--- conga/luci/conga_ssl/setup.py 2007/09/18 21:21:52 1.4
+++ conga/luci/conga_ssl/setup.py 2008/01/17 18:45:11 1.5
@@ -1,7 +1,7 @@
from distutils.core import setup, Extension

module1 = Extension('conga_ssl_lib',
- define_macros = [('MAJOR_VERSION', '0'), ('MINOR_VERSION', '10')],
+ define_macros = [('MAJOR_VERSION', '0'), ('MINOR_VERSION', '12')],
include_dirs = ['../../ricci/include', '/usr/include/libxml2'],
libraries = ['ssl', 'xml2'],
sources = [
@@ -15,14 +15,14 @@
'../../ricci/common/File.cpp',
'../../ricci/common/XML.cpp',
'../../ricci/common/utils.cpp',
+ '../../ricci/common/sys_util.c',
'../../ricci/common/executils.cpp'])

setup (name = 'conga_ssl_lib',
- version = '0.10',
+ version = '0.12',
description = 'SSL Python bindings for Conga',
- author = 'Stanko Kupcevic',
- author_email = 'kupcevic@redhat.com',
- copyright = 'Red Hat, Inc.',
+ author = 'Red Hat, Inc.',
+ author_email = 'rmccabe@redhat.com',
license = 'GPL',
url = 'http://www.sourceware.org/cluster/conga',
long_description = '
--- conga/luci/site/luci/Extensions/storage_adapters.py 2007/09/24 21:19:42 1.13
+++ conga/luci/site/luci/Extensions/storage_adapters.py 2008/01/17 18:45:11 1.14
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2006-2008 Red Hat, Inc.
#
# This program is free software; you can redistribute
# it and/or modify it under the terms of version 2 of the
 

Thread Tools




All times are GMT. The time now is 08:05 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org