- merged from DEVEL branch

- upgrade to version 1.3.0 final
- changed warning

Changed files:
    Zope-archetypes.spec -> 1.26

diff --git a/Zope-archetypes.spec b/Zope-archetypes.spec
index 3d389ef4894c21d36447317eaf95db9f70a3d3f7..65f68756ca71f61bfec69169761c340e04b10ada 100644 (file)
--- a/Zope-archetypes.spec
+++ b/Zope-archetypes.spec
@@ -1,25 +1,29 @@
+#
+# Warning: Some old products can cause problems with archetypes - e.g. PortalTransport
+#
 %define                zope_subname    archetypes
 Summary:       Framework designed to facilitate the building of applications for Plone and CMF. 
 Summary(pl):   ¦rodowsko u³atwiaj±ce budowanie aplikacji dla Plone i CMF.
 Name:          Zope-%{zope_subname}
-Version:       1.2.5
-%define                sub_ver rc5
-Release:       0.%{sub_ver}.2
+Version:       1.3.0
+#%%define              sub_ver rc3
+Release:       4
 License:       GPL
 Group:         Development/Tools
-Source0:       http://dl.sourceforge.net/%{zope_subname}/Archetypes-%{version}-%{sub_ver}.tar.gz
-# Source0-md5: 8cde5eead180d4ee166749803c684820
+Source0:       http://dl.sourceforge.net/%{zope_subname}/Archetypes-%{version}-final-Bundle.tgz
+# Source0-md5: 7bc41ec1de6682f57e603e34a1d19eaa
 URL:           http://dreamcatcher.homeunix.org/
 %pyrequires_eq python-modules
 Requires:      Zope
 Requires:      Zope-CMFPlone
 Requires:      Zope-CMF
+Requires:      rtf-converter
 Requires(post,postun):  /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     Zope-PortalTransforms
 Conflicts:     CMF
 Conflicts:     Plone
+Obsoletes:     Zope-PortalTransforms
 
 %description
 Archetypes (formerly known as CMFTypes) is a framework designed 
@@ -40,32 +44,30 @@ find . -type d -name debian | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
 
 %build
-mkdir docs docs/{Archetypes,PortalTransforms,generator,validation}
-install -d docs/{Archetypes,PortalTransforms,generator,validation}
-mv -f Archetypes-%{version}-%{sub_ver}/Archetypes/{AUTHORS,ChangeLog,README.txt,DEPENDS} docs/Archetypes
-rm -rf Archetypes-%{version}-%{sub_ver}/Archetypes/LICENSE.*
-mv -f Archetypes-%{version}-%{sub_ver}/PortalTransforms/{ChangeLog,DEPENDS,README,SUGGESTS,TODO} docs/PortalTransforms
-rm -rf Archetypes-%{version}-%{sub_ver}/PortalTransforms/{LICENSE.txt,MANIFEST.in,Makefile}
-mv -f Archetypes-%{version}-%{sub_ver}/generator/{ChangeLog,README} docs/generator
-rm -rf Archetypes-%{version}-%{sub_ver}/{generator,validation}/MANIFEST.in
-mv -f Archetypes-%{version}-%{sub_ver}/validation/{ChangeLog,README} docs/validation
+mkdir docs docs/{Archetypes,MimetypesRegistry,PortalTransforms,generator,validation}
+install -d docs/{Archetypes,MimetypesRegistry,PortalTransforms,generator,validation}
+mv -f Archetypes/{AUTHORS,ChangeLog,HISTORY.txt,README.txt,DEPENDS,TODO.txt} docs/Archetypes
+mv -f MimetypesRegistry/{ChangeLog,HISTORY.txt,README} docs/MimetypesRegistry
+mv -f PortalTransforms/{ChangeLog,DEPENDS,HISTORY.txt,README,SUGGESTS,TODO} docs/PortalTransforms
+rm -rf PortalTransforms/{MANIFEST.in,Makefile}
+mv -f generator/{ChangeLog,README,HISTORY.txt} docs/generator
+rm -rf {generator,validation}/MANIFEST.in
+mv -f validation/{ChangeLog,README,HISTORY.txt} docs/validation
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -af Archetypes-%{version}-%{sub_ver}/{Archetypes,PortalTransforms,generator,validation} $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -af {Archetypes,MimetypesRegistry,PortalTransforms,generator,validation} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
 %py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-for p in Archetypes PortalTransforms generator validation; do
+for p in Archetypes MimetypesRegistry generator validation PortalTransforms; do
     /usr/sbin/installzopeproduct %{_datadir}/%{name}/$p
 done
 if [ -f /var/lock/subsys/zope ]; then
@@ -74,7 +76,7 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-    for p in Archetypes PortalTransforms generator validation; do
+    for p in Archetypes MimetypesRegistry generator validation PortalTransforms; do
         /usr/sbin/installzopeproduct -d $p
     done
 fi