SPECS: nginx.spec - cleanups, gid 212 is already reserved

[glen]

Author: glen                         Date: Sun Feb 25 15:21:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups, gid 212 is already reserved

---- Files affected:
SPECS:
   nginx.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.7 SPECS/nginx.spec:1.8
--- SPECS/nginx.spec:1.7	Sun Feb 25 16:05:41 2007
+++ SPECS/nginx.spec	Sun Feb 25 16:21:26 2007
@@ -1,37 +1,32 @@
 # $Revision$, $Date$
 # TODO
 # - bconds for modules as these are statically linked in
+# - XXX gid 212 is reserved by ies4linux (PLD-doc/uid_gid.db.txt)
 # - logrotate script
-
-%bcond_with     initscript    # initscript
-
 Summary:	High perfomance HTTP and reverse proxy server
 Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajności
 Name:		nginx
 Version:	0.5.14
 Release:	0.1
 License:	BSD-like
-Group:		Applications
+Group:		Networking/Daemons
 Source0:	http://sysoev.ru/nginx/%{name}-%{version}.tar.gz
 # Source0-md5:	3415c2b49b66fae5b11ca348ec0c2605
 Source1:	%{name}.init
 Patch0:		%{name}-config.patch
 URL:		http://nginx.net/
-Requires(post,preun):   /sbin/chkconfig
-Requires(postun):       /usr/sbin/groupdel
-Requires(postun):       /usr/sbin/userdel
-Requires(pre):  /bin/id
-Requires(pre):  /usr/bin/getgid
-Requires(pre):  /usr/sbin/groupadd
-Requires(pre):  /usr/sbin/useradd
-%if %{with initscript}
-BuildRequires:	rpmbuild(macros) >= 1.228
-Requires(post,preun):	/sbin/chkconfig
-Requires(post,preun):	rc-scripts
-%endif
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir /etc/%{name}
@@ -88,10 +83,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
+# - XXX gid 212 is reserved by ies4linux (PLD-doc/uid_gid.db.txt)
 %groupadd -r -g 212 %{name}
 %useradd -r -u 212 -d /usr/share/empty -s /bin/false -c "Nginx HTTP User" -g %{name} %{name}
 
-%if %{with initscript}
 %post
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -101,15 +96,13 @@
 	%service -q %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
-%endif
 
 %postun
 if [ "$1" = "0" ]; then
-        %userremove %{name}
-        %groupremove %{name}
+	%userremove %{name}
+	%groupremove %{name}
 fi
 
-
 %files
 %defattr(644,root,root,755)
 %doc CHANGES LICENSE README html/index.html conf/nginx.conf
@@ -129,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/02/25 15:21:26  glen
+- cleanups, gid 212 is already reserved
+
 Revision 1.7  2007/02/25 15:05:41  mis
 - added initscript, logs and cache directories
 - runned as nginx user
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nginx.spec?r1=1.7&r2=1.8&f=u