X-Git-Url: http://git.pld-linux.org/?p=packages%2FZope-CMFForum.git;a=blobdiff_plain;f=Zope-CMFForum.spec;h=1c6462f0e82ea8f73ec85a0c18605ba8b1ada70a;hp=d38287aca6cc62758e21f1f85047b22011d3d689;hb=HEAD;hpb=4e64a0beb322fe00c00bfa2ee376c06ebee86add

diff --git a/Zope-CMFForum.spec b/Zope-CMFForum.spec
index d38287a..1c6462f 100644
--- a/Zope-CMFForum.spec
+++ b/Zope-CMFForum.spec
@@ -1,47 +1,48 @@
-%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.UTF-8):	Dodatek do Zope dający możliwość wysłania e-maila
 Name:		Zope-%{zope_subname}
 Version:	1.0
-Release:	2
+Release:	10
 License:	ZPL 2.0
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/collective/%{zope_subname}-%{version}.tgz
 # Source0-md5:	dc9ee26b8c78a32238afd2540dcf258c
 URL:		http://sourceforge.net/projects/collective/
+BuildRequires:	python
+BuildRequires:	rpmbuild(macros) >= 1.268
 %pyrequires_eq	python-modules
+Requires(post,postun):	/usr/sbin/installzopeproduct
 Requires:	Zope >= 2.5.1
-Requires:	Zope-CMF >= 1.3
+Requires:	Zope-CMF >= 1:1.4
+Conflicts:	CMF
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%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
 in user gets 'username' as Author and email from preferences. Security
 cleanup.
 
-%description -l pl
-CMMForum jest dodatkiem do Zope umo¿liwiaj±cym dodanie formy wysy³ania
-e-mailem bez mo¿liwo¶ci wysy³ania za³±czników. Anonymous mo¿e ustawiæ
-adres e-mail, a je¿eli zaloguje siê jako konkretny u¿ytkownik, wtedy
-pobierane s± odpowiednie pola z preferencji. Dodatek sprawdzony pod
-wzglêdem bezpieczeñstwa.
+%description -l pl.UTF-8
+CMMForum jest dodatkiem do Zope umożliwiającym dodanie formy wysyłania
+e-mailem bez możliwości wysyłania załączników. Anonymous może ustawić
+adres e-mail, a jeżeli zaloguje się jako konkretny użytkownik, wtedy
+pobierane są odpowiednie pola z preferencji. Dodatek sprawdzony pod
+względem bezpieczeństwa.
 
 %prep
 %setup -q -n %{zope_subname}
 
 %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,version.txt} $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 {} \;;
 
@@ -49,16 +50,16 @@ cp -af {Extensions,interfaces,skins,*.py,*.gif} $RPM_BUILD_ROOT%{product_dir}/%{
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/zope ]; then
-	/etc/rc.d/init.d/zope restart >&2
-fi
+/usr/sbin/installzopeproduct %{_datadir}/%{name} %{zope_subname}
+%service -q zope restart
 
 %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}
+	%service -q zope restart
 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}
+%doc CHANGES.txt CREDITS.txt HISTORY.txt INSTALL.txt README.txt TODO.txt
+%{_datadir}/%{name}