- upgraded to 1.5.0

- general reorganization
- typo

Changed files:
    Zope-Formulator.spec -> 1.14

diff --git a/Zope-Formulator.spec b/Zope-Formulator.spec
index f5616144fd522b103cda1e37c7c9dfa26a434381..25a1080bf3a4e5dc707bed499216055e289b417f 100644 (file)
--- a/Zope-Formulator.spec
+++ b/Zope-Formulator.spec
@@ -1,54 +1,65 @@
-%define prod_name Formulator
+%include        /usr/lib/rpm/macros.python
+
+%define        zope_subname    Formulator
+
 Summary:       Zope framework that eases the creation and validation of web forms
 Summary(pl):   Dodatek do Zope u³atwiaj±cy tworzenie i sprawdzanie poprawno¶ci formularzy WWW
-Name:          Zope-%{prod_name}
-Version:       1.0.1
+Name:          Zope-%{zope_subname}
+Version:       1.5.0
 Release:       1
 License:       BSD-like
-Group:         Development/Languages/Python
-Source0:       http://www.zope.org/Members/faassen/Formulator/%{prod_name}-%{version}.tgz
-# Source0-md5: ee9d0f3b000f14f66962440fc2e638ae
-URL:           http://www.zope.org/Members/faassen/Formulator/
-BuildRequires: python >= 2.1
+Group:         Development/Tools
+Source0:       http://www.zope.org/Members/infrae/Formulator/Formulator-%{version}/%{zope_subname}-%{version}.tgz
+# Source0-md5: 3a8dbedbc72f9176ca7fe5a54043e8d4
+URL:           http://www.zope.org/Members/infrae/Formulator/
+%pyrequires_eq  python-modules
 Requires:      Zope
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define python_compile_opt python -O -c "import compileall; compileall.compile_dir('.')"
-%define python_compile     python -c "import compileall; compileall.compile_dir('.')"
-
-%define zope_dir          %{_libdir}/zope
-%define zope_productsdir   %{zope_dir}/Products
+%define         product_dir     /usr/lib/zope/Products
 
 %description
-%{prod_name} is a tool to help with the creation and validation of web
+%{zope_subname} is a tool to help with the creation and validation of web
 forms. Form fields are stored as objects in Zope, in a special Form folder.
 
 %description -l pl
-%{prod_name} jest narzêdziem pomagaj±cym przy tworzeniu i sprawdzaniu
-poprawno¶ci formularzy WW. Pola formularza s± zapisywane jako obiekty
+%{zope_subname} jest narzêdziem pomagaj±cym przy tworzeniu i sprawdzaniu
+poprawno¶ci formularzy WWW. Pola formularza s± zapisywane jako obiekty
 w Zope, w specjalnym folderze Form.
 
 %prep
-%setup -q -n %{prod_name}
+%setup -q -n %{zope_subname}
 
 %build
-%{python_compile}
-%{python_compile_opt}
-
-find . -name \*.py | xargs -r rm -f
+mkdir docs
+mv -f {CREDITS.txt,HISTORY.txt,INSTALL.txt,README.txt,TODO.txt} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{zope_productsdir}/%{prod_name}
+install -d $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}
+cp -af * $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}
 
-cp -a . $RPM_BUILD_ROOT%{zope_productsdir}/%{prod_name}
-rm -f $RPM_BUILD_ROOT%{zope_productsdir}/%{prod_name}/*.gz
+find $RPM_BUILD_ROOT -type f -name "*.py" -exec rm -rf {} \;;
+rm -rf $RPM_BUILD_ROOT%{product_dir}/%{zope_subname}/docs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+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
+fi
+               
 %files
 %defattr(644,root,root,755)
-%doc *.txt
-%{zope_productsdir}/%{prod_name}
+%doc docs/*
+%{product_dir}/%{zope_subname}