- install into new dir (datadir)

- installzopeproduct
- cleaning

Changed files:
    Zope-CMFForum.spec -> 1.12

diff --git a/Zope-CMFForum.spec b/Zope-CMFForum.spec
index 49a24d6b521b88a5c923542835fdaf7d7fd88324..42fdaa7cc6ddb229f2858cfa951a488f791ee66e 100644 (file)
--- a/Zope-CMFForum.spec
+++ b/Zope-CMFForum.spec
@@ -1,10 +1,10 @@
 %include       /usr/lib/rpm/macros.python
 %define                zope_subname    CMFForum
-Summary:       CMFForum - a Zope product that Anonymous can post by default
-Summary(pl):   CMFForum - dodatek do Zope daj±cy mo¿liwo¶æ wys³ania e-maila
+Summary:       A Zope product that Anonymous can post by default
+Summary(pl):   Dodatek do Zope daj±cy mo¿liwo¶æ wys³ania e-maila
 Name:          Zope-%{zope_subname}
 Version:       1.0
-Release:       5
+Release:       6
 License:       ZPL 2.0
 Group:         Development/Tools
 Source0:       http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tgz
@@ -13,12 +13,11 @@ URL:                http://sourceforge.net/projects/collective/
 %pyrequires_eq python-modules
 Requires:      Zope >= 2.5.1
 Requires:      Zope-CMF >= 1.3
+Requires(post,postun):  /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:     CMF
 
-%define        product_dir     /usr/lib/zope/Products
-
 %description
 CMMForum is a Zope product - Anonymous can post by default but can't
 add Attachments - Anonymous can set Author and e-mail fields. Logged
@@ -37,12 +36,12 @@ wzgl
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cp -af {Extensions,interfaces,skins,*.py,*.gif} $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+cp -af {Extensions,interfaces,skins,*.py,*.gif} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%py_comp $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
-%py_ocomp $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
+%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # find $RPM_BUILD_ROOT -type f -name "*.py" -exec rm -rf {} \;;
 
@@ -50,16 +49,20 @@ cp -af {Extensions,interfaces,skins,*.py,*.gif} $RPM_BUILD_ROOT%{product_dir}/%{
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
 if [ -f /var/lock/subsys/zope ]; then
        /etc/rc.d/init.d/zope restart >&2
 fi
 
 %postun
-if [ -f /var/lock/subsys/zope ]; then
-       /etc/rc.d/init.d/zope restart >&2
+if [ "$1" = "0" ]; then
+        /usr/sbin/installzopeproduct -d %{zope_subname}
+        if [ -f /var/lock/subsys/zope ]; then
+                /etc/rc.d/init.d/zope restart >&2
+        fi
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGES.txt CREDITS.txt HISTORY.txt INSTALL.txt LICENSE.txt README.txt TODO.txt
-%{product_dir}/%{zope_subname}
+%{_datadir}/%{name}