- install into new dir (datadir)

- installzopeproduct
- cleaning

Changed files:
    Zope-CMFPhoto.spec -> 1.9

diff --git a/Zope-CMFPhoto.spec b/Zope-CMFPhoto.spec
index 2e631869e59d7650ad257b3bb1672f2a183e0852..c172972252af221bf2a6b322485b946157162332 100644 (file)
--- a/Zope-CMFPhoto.spec
+++ b/Zope-CMFPhoto.spec
@@ -1,10 +1,10 @@
 %include       /usr/lib/rpm/macros.python
 %define                zope_subname    CMFPhoto
-Summary:       CMFPhoto - a Zope product with wrapper objects and a Plone skin for the Photo product
-Summary(pl):   CMFPhoto - dodatek dla Zope umo¿liwiaj±cy operacje na obiektach i skórach w Plone
+Summary:       A Zope product with wrapper objects and a Plone skin for the Photo product
+Summary(pl):   Dodatek dla Zope umo¿liwiaj±cy operacje na obiektach i skórach w Plone
 Name:          Zope-%{zope_subname}
 Version:       0.3
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tar.gz
@@ -15,13 +15,12 @@ Requires:   Zope-CMF >= 1.3
 Requires:      ImageMagick
 Requires:      Zope-CMFPlone >= 1.0.1
 Requires:      Zope >= 2.6.1
+Requires(post,postun):  /usr/sbin/installzopeproduct
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Conflicts:     CMF
 Conflicts:     Plone
 
-%define        product_dir     /usr/lib/zope/Products
-
 %description
 CMFPhoto is a Zope product with wrapper objects and a Plone skin for
 the Photo product.
@@ -35,12 +34,12 @@ i sk
 
 %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,i18n,skins,*.py} $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+cp -af {Extensions,i18n,skins,*.py} $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 {} \;;
 
@@ -48,16 +47,20 @@ cp -af {Extensions,i18n,skins,*.py} $RPM_BUILD_ROOT%{product_dir}/%{zope_subname
 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 HISTORY.txt README.txt
-%{product_dir}/%{zope_subname}
+%{_datadir}/%{name}