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

- installzopeproduct in %post and %postun

Changed files:
    Zope-CMFQuickInstallerTool.spec -> 1.10

diff --git a/Zope-CMFQuickInstallerTool.spec b/Zope-CMFQuickInstallerTool.spec
index d7e696af4828063c5c78209de7cf8bd1813ab643..e487cf42819009b87262a1bd4a84d4f6a1246519 100644 (file)
--- a/Zope-CMFQuickInstallerTool.spec
+++ b/Zope-CMFQuickInstallerTool.spec
@@ -13,6 +13,7 @@ URL:          http://cvs.bluedynamics.org/viewcvs/CMFQuickInstallerTool/
 %pyrequires_eq python-modules
 Requires:      Zope-CMF
 Requires:      Zope
+Requires(post,postun): /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     CMF
@@ -37,12 +38,12 @@ rm -rf {forms,interfaces}/CVS
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cp -af {forms,interfaces,*.py,*.gif} $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+cp -af {forms,interfaces,*.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 +51,20 @@ cp -af {forms,interfaces,*.py,*.gif} $RPM_BUILD_ROOT%{product_dir}/%{zope_subnam
 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 AUTHORS README.txt
-%{product_dir}/%{zope_subname}
+%{_datadir}/%{name}