- changed some obsoletes to conflicts

[packages/Zope-CMFCollector.git] / Zope-CMFCollector.spec

diff --git a/Zope-CMFCollector.spec b/Zope-CMFCollector.spec
index d9765e198e18c326c1b6311623c62ae460404794..26bb484e491d06c34b811770c8e8603a0bceb5da 100644 (file)
--- a/Zope-CMFCollector.spec
+++ b/Zope-CMFCollector.spec
@@ -1,22 +1,22 @@
-
 %include       /usr/lib/rpm/macros.python
-
 %define                zope_subname    CMFCollector
-
-Summary:       CMFCollector is an issue collector for Zope.
-Summary(pl):   CMFCollector jest dodatkiem do Zope umo¿liwiaj±cy zbieranie wyników
+Summary:       CMFCollector - an issue collector for Zope
+Summary(pl):   CMFCollector - dodatek do Zope umo¿liwiaj±cy zbieranie wyników
 Name:          Zope-%{zope_subname}
 Version:       0.9b
-Release:       1
-License:       GNU
+Release:       6
+License:       ZPL 2.0
 Group:         Development/Tools
-Source0:       http://cvs.zope.org/CMF/%{zope_subname}/%{zope_subname}.tar.gz?tarball=1
+#Source0:      http://cvs.zope.org/CMF/%{zope_subname}/%{zope_subname}.tar.gz?tarball=1
+Source0:       %{zope_subname}.tar.gz
 # Source0-md5: 151c906d1058115f3f98155ec042f8fe
 URL:           http://cvs.zope.org/CMF/%{zope_subname}/
 %pyrequires_eq python-modules
-Requires:      Zope
-Requires:      CMF
+Requires:      Zope-CMF >= 1.2
+Requires:      Zope >= 2.4
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Conflicts:     CMF
 
 %define        product_dir     /usr/lib/zope/Products
 
@@ -24,24 +24,22 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 CMFCollector is an issue collector for Zope.
 
 %description -l pl
-CMFCollector jest dodatkiem do Zope umo¿liwiaj±cy zbieranie wyników
+CMFCollector jest dodatkiem do Zope umo¿liwiaj±cym zbieranie wyników.
 
 %prep
-%setup -q -c %{zope_subname}.tar.gz?tarball=1
-
-%build
+%setup -q -n %{zope_subname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}/help
 
-install -d $RPM_BUILD_ROOT%{product_dir}
-cp -af * $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+# should tests be included or not?
+cp -af {Extensions,dtml,skins,tests,*.py,*.zexp} $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
 
 %py_comp $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
 %py_ocomp $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
 
-rm -rf $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}/*.txt
-find $RPM_BUILD_ROOT -type f -name "*.py" -exec rm -rf {} \;;
+# find $RPM_BUILD_ROOT -type f -name "*.py" -exec rm -rf {} \;;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,8 +49,6 @@ if [ -f /var/lock/subsys/zope ]; then
        /etc/rc.d/init.d/zope restart >&2
 fi
 
-%preun
-
 %postun
 if [ -f /var/lock/subsys/zope ]; then
        /etc/rc.d/init.d/zope restart >&2
@@ -60,5 +56,5 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc %{zope_subname}/*.txt
+%doc INSTALL.txt KNOWN_PROBLEMS.txt README.txt TODO.txt
 %{product_dir}/%{zope_subname}