From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga conga.spec.in.in Plone-2.5_CMFPlone.patc ...
Date: 8 Aug 2006 18:11:30 -0000 [thread overview]
Message-ID: <20060808181130.6004.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-08-08 18:11:27
Modified files:
. : conga.spec.in.in
Added files:
. : Plone-2.5_CMFPlone.patch
Removed files:
. : Plone-2.5_Marhsall_ro_file.patch
Log message:
The Marshall patch is no longer needed, as we can now remove the Marshall product, but a patch against the CMFPlone Product is needed in order to kill the ATContentTypes product
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5_CMFPlone.patch.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5_Marhsall_ro_file.patch.diff?cvsroot=cluster&r1=1.1&r2=NONE
/cvs/cluster/conga/Plone-2.5_CMFPlone.patch,v --> standard output
revision 1.1
--- conga/Plone-2.5_CMFPlone.patch
+++ - 2006-08-08 18:11:29.760131000 +0000
@@ -0,0 +1,44 @@
+diff -r -U5 Plone-2.5.orig/CMFPlone/exportimport/configure.zcml Plone-2.5/CMFPlone/exportimport/configure.zcml
+--- Plone-2.5.orig/CMFPlone/exportimport/configure.zcml 2006-06-18 13:28:00.000000000 -0400
++++ Plone-2.5/CMFPlone/exportimport/configure.zcml 2006-08-08 14:07:13.000000000 -0400
+@@ -23,16 +23,10 @@
+ provides="Products.GenericSetup.interfaces.IFilesystemImporter"
+ for="Products.CMFCore.interfaces.ISiteRoot"
+ />
+
+ <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
+ Products.GenericSetup.interfaces.ISetupEnviron"
+ />
+@@ -42,23 +36,10 @@
+ provides="Products.GenericSetup.interfaces.IBody"
+ for="Products.CMFPlone.interfaces.IControlPanel
+ 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"
+ for="Products.CMFPlone.exportimport.content.IDisabledExport"
+ />
--- conga/conga.spec.in.in 2006/08/04 22:14:32 1.25
+++ conga/conga.spec.in.in 2006/08/08 18:11:26 1.26
@@ -42,7 +42,7 @@
%if "%{include_zope_and_plone}" == yes
Source1: %{zope_archive_file}
Source2: %{plone_archive_file}
-Patch2: Plone-2.5_Marhsall_ro_file.patch
+Patch2: Plone-2.5_CMFPlone.patch
%endif
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
reply other threads:[~2006-08-08 18:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060808181130.6004.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.