SPECS: nginx.spec - error with install nginx binary

[sardzent]

Author: sardzent                     Date: Thu Nov 29 18:54:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- error with install nginx binary 

---- Files affected:
SPECS:
   nginx.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.44 SPECS/nginx.spec:1.45
--- SPECS/nginx.spec:1.44	Thu Nov 29 19:18:19 2007
+++ SPECS/nginx.spec	Thu Nov 29 19:54:43 2007
@@ -3,7 +3,6 @@
 # - /etc/sysconfig/nginx file
 # - missing perl build/install requires
 # - prepare pld style like nginx.conf
-# - split into nginx-common, nginx, nginx-perl packages
 #
 # Conditional build for nginx:
 %bcond_without	light		# don't build light version
@@ -25,7 +24,7 @@
 Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajności
 Name:		nginx
 Version:	0.5.33
-Release:	0.3
+Release:	0.5
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://sysoev.ru/nginx/%{name}-%{version}.tar.gz
@@ -156,7 +155,6 @@
 Requires(postun):	/usr/sbin/userdel
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	openssl
-Requires:	perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
 Provides:	group(http)
 Provides:	group(nginx)
 Provides:	user(nginx)
@@ -473,13 +471,13 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pre common
 %groupadd -r -g 213 %{name}
 %groupadd -g 51 http
 %useradd -r -u 213 -d /usr/share/empty -s /bin/false -c "Nginx HTTP User" -g %{name} %{name}
 %addusertogroup %{name} http
 
-%post
+%post common
 for a in access.log error.log; do
 	if [ ! -f /var/log/%{name}/$a ]; then
 		touch /var/log/%{name}/$a
@@ -487,6 +485,20 @@
 		chmod 644 /var/log/%{name}/$a
 	fi
 done
+
+%pre
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
+%pre light
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
+%pre perl
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+
+%pre mail
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
@@ -496,7 +508,25 @@
 	/sbin/chkconfig --del %{name}
 fi
 
-%postun
+%preun light
+if [ "$1" = "0" ]; then
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+
+%preun perl
+if [ "$1" = "0" ]; then
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+
+%preun mail
+if [ "$1" = "0" ]; then
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+
+%postun common
 if [ "$1" = "0" ]; then
 	%userremove %{name}
 	%groupremove %{name}
@@ -508,7 +538,7 @@
 
 %files common
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README html/index.html conf/nginx.conf objs/src/http/modules/perl/blib/man3/nginx.3pm
+%doc CHANGES LICENSE README html/index.html conf/nginx.conf 
 %doc %lang(ru) CHANGES.ru
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %dir %attr(754,root,root) %{_sysconfdir}
@@ -559,6 +589,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2007-11-29 18:54:43  sardzent
+- error with install nginx binary
+
 Revision 1.44  2007-11-29 18:18:19  sardzent
 - cleanup with bcond
 - still working
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nginx.spec?r1=1.44&r2=1.45&f=u