- upgraded to version 1.5.4

Changed files:
    Zope-CMF.spec -> 1.26

diff --git a/Zope-CMF.spec b/Zope-CMF.spec
index ca147431e001ec155fd7b6204c2f09dc0e6b6eda..44923e3701754815724f76cbf49100c1ddbe981f 100644 (file)
--- a/Zope-CMF.spec
+++ b/Zope-CMF.spec
@@ -2,20 +2,17 @@
 Summary:       Content Management Framework for Zope
 Summary(pl):   ¦rodowisko zarz±dzania tre¶ci± dla Zope
 Name:          Zope-%{zope_subname}
-Version:       1.4.7
-#%%define              sub_ver rc1
-#%%define              plone_ver CMFPlone2.0-rc6
-#%%define              plone_dir CMFPlone-2.0-rc6
-Release:       2
+Version:       1.5.4
+Release:       1
 Epoch:         1
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
 Source0:       http://zope.org/Products/CMF/%{zope_subname}-%{version}/%{zope_subname}-%{version}.tar.gz
-# Source0-md5: 2aca7518950444fa4f7437860865647f
+# Source0-md5: 3141c68b3be83c88d6b86efd25405974
 URL:           http://cmf.zope.org/
 BuildRequires: python
 %pyrequires_eq python-modules
-Requires:      Zope
+Requires:      Zope >= 2.7.7
 Requires(post,postun): /usr/sbin/installzopeproduct
 Obsoletes:     CMF
 BuildArch:     noarch
@@ -36,11 +33,13 @@ system zarz
 
 %build
 #mkdir docs
-mkdir docs/CMFCalendar docs/CMFCore docs/CMFDefault docs/CMFTopic docs/DCWorkflow
-mv -f {CHANGES.txt,HISTORY.txt,INSTALL*,README.txt} docs/
+mkdir docs/CMFActionIcons docs/CMFCalendar docs/CMFCore docs/CMFDefault docs/CMFSetup docs/CMFTopic docs/DCWorkflow
+mv -f CMFActionIcons/README.txt docs/CMFActionIcons
+mv -f {CHANGES.txt,HISTORY.txt,INSTALL*,README.txt,all*.py} docs/
 mv -f CMFCalendar/{INSTALL.txt,README.txt,TODO.txt,CREDITS.txt} docs/CMFCalendar
 mv -f CMFCore/README.txt docs/CMFCore
 mv -f CMFDefault/README.txt docs/CMFDefault
+mv -f CMFSetup/{CREDITS.txt,README.txt} docs/CMFSetup
 mv -f CMFTopic/README.txt docs/CMFTopic
 mv -f DCWorkflow/{README.txt,CHANGES.txt} docs/DCWorkflow
 
@@ -48,7 +47,7 @@ mv -f DCWorkflow/{README.txt,CHANGES.txt} docs/DCWorkflow
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cp -af {CMFCalendar,CMFCore,CMFDefault,CMFTopic,DCWorkflow} $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -af {CMFActionIcons,CMFCalendar,CMFCore,CMFDefault,CMFSetup,CMFTopic,CMFUid,DCWorkflow} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -60,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for p in CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow ; do
+for p in CMFActionIcons CMFCalendar CMFCore CMFDefault CMFSetup CMFTopic CMFUid DCWorkflow ; do
        /usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
 done
 if [ -f /var/lock/subsys/zope ]; then
@@ -69,7 +68,7 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       for p in CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow ; do
+       for p in CMFActionIcons CMFCalendar CMFCore CMFDefault CMFSetup CMFTopic CMFUid DCWorkflow ; do
                /usr/sbin/installzopeproduct -d $p
        done
 fi