- upgraded to version 2.1

Changed files:
    Zope-CMFPlone.spec -> 1.44

diff --git a/Zope-CMFPlone.spec b/Zope-CMFPlone.spec
index 2ad83fd2a10ae71326c1330fd859b340f0f03fa9..27864879c963796e8395159ac0894956a0295c63 100644 (file)
--- a/Zope-CMFPlone.spec
+++ b/Zope-CMFPlone.spec
@@ -3,33 +3,33 @@
 Summary:       Free and open source Content Management System based on Zope and CMF
 Summary(pl):   Darmowy i otwarty system zarz±dzania tre¶ci± oparty na Zope i CMF
 Name:          Zope-%{zope_subname}
-Version:       2.0.5
-# %%define             sub_ver RC6
-Release:       6
+Version:       2.1
+Release:       1
 License:       Zope Public License (ZPL), GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/plone/Plone-%{version}.tar.gz
-# Source0-md5: fe8ce932877c53bb22b1f88d2b4c9211
+# Source0-md5: a72efb9aace662ac8f81f3f66ad7c44c
 URL:           http://www.plone.org/
 BuildRequires: python
 %pyrequires_eq python-modules
 Requires:      i18ndude
-Requires:      Zope-archetypes >= 1.2.5
-Requires:      Zope-CMF = 1:1.4.7
-Requires:      Zope >= 2.6.2
-Requires:      Zope-BTreeFolder2
-Requires:      Zope-CMFQuickInstallerTool >= 1.5.1
+Requires:      Zope-archetypes >= 1.3.4
+Requires:      Zope-kupu >= 1.3
+Requires:      Zope-CMF = 1:1.5.4
+Requires:      Zope >= 2.7.7
+Requires:      Zope-BTreeFolder2 >= 1.0.2
+Requires:      Zope-CMFQuickInstallerTool >= 1.5.5
 Requires:      Zope-Epoz >= 0.8.2
-Requires:      Zope-ExternalEditor
+Requires:      Zope-ExternalEditor >= 0.9.1
 Requires:      Zope-Formulator >= 1.6.2
-Requires:      Zope-GroupUserFolder >= 2.0.1
-Requires:      Zope-PlacelessTranslationService
+Requires:      Zope-GroupUserFolder >= 1:3.4
+Requires:      Zope-PlacelessTranslationService >= 1.2.1
+Requires:      Zope-PloneLanguageTool >= 0.7
 Requires(post,postun): /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     Plone
 Obsoletes:     Zope-PortalTransforms
-#Conflicts:    Zope-CMF = 1.5.0
 Conflicts:     CMF
 
 %description
@@ -53,6 +53,8 @@ Pythonem.
 # remove dirs - additional packages!
 # ExternalEditor
 rm -rf {BTreeFolder2,CMFQuickInstallerTool,Formulator,GroupUserFolder,Archetypes,generator,validation}
+rm -rf {PloneLanguageTool,kupu,MimetypesRegistry}
+rm -rf {CMFActionIcons,CMFSetup,CMFUid}
 rm -rf {CMFCalendar,CMFCore,CMFDefault,CMFTopic,DCWorkflow,PortalTransforms,Epoz}
 rm -rf {ExternalEditor,PlacelessTranslationService}
 find . -type d -name debian | xargs rm -rf
@@ -60,7 +62,6 @@ find . -type d -name debian | xargs rm -rf
 %build
 mkdir docs docs/CMFPlone docs/CMFFormController docs/PloneErrorReporting
 mv -f CMFPlone/{CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt,UPGRADE.txt,LICENSE.txt} docs/CMFPlone
-# mv -f CMFPlone/docs/* docs/CMFPlone
 rm -rf CMFPlone/LICENSE.GPL
 mv -f CMFFormController/{AUTHORS,ChangeLog,README.txt} docs/CMFFormController
 rm -rf CMFPlone/docs
@@ -81,16 +82,23 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for p in CMFPlone CMFActionIcons CMFFormController PloneErrorReporting; do
+for p in ATContentTypes ATReferenceBrowserWidget CMFFormController CMFPlone ExtendedPathIndex PloneErrorReporting; do
        /usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
 done
+for p in PloneTranslations ResourceRegisteries SecureMailHost; do
+       /usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
+done  
+
 if [ -f /var/lock/subsys/zope ]; then
        /etc/rc.d/init.d/zope restart >&2
 fi
 
 %postun
 if [ "$1" = "0" ]; then
-       for p in CMFPlone CMFActionIcons CMFFormController PloneErrorReporting; do
+       for p in ATContentTypes ATReferenceBrowserWidget CMFFormController CMFPlone ExtendedPathIndex PloneErrorReporting; do
+               /usr/sbin/installzopeproduct -d $p
+       done
+       for p in PloneTranslations ResourceRegisteries SecureMailHost; do
                /usr/sbin/installzopeproduct -d $p
        done
        if [ -f /var/lock/subsys/zope ]; then