- install in %{_datadir}/%{name}

- installzopeproduct in %post, %postun

Changed files:
    Zope-Formulator.spec -> 1.16

diff --git a/Zope-Formulator.spec b/Zope-Formulator.spec
index 0e122bd708196d35f34331cd737b5fe37d3c3054..7d26a7ba5ad76fd451b5e87b85d85137fa1d7993 100644 (file)
--- a/Zope-Formulator.spec
+++ b/Zope-Formulator.spec
@@ -37,29 +37,33 @@ mv -f {CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt,TODO.txt} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
-cp -af * $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -af * $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 {} \;;
-rm -rf $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}/docs
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/docs
 
 %clean
 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
+       /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 docs/*
-%{product_dir}/%{zope_subname}
+%{_datadir}/%{name}