SPECS: nginx.spec - burdel in progress, new concept

sardzent sardzent at pld-linux.org
Fri Nov 30 10:04:47 CET 2007 

Author: sardzent                     Date: Fri Nov 30 09:04:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- burdel in progress, new concept

---- Files affected:
SPECS:
   nginx.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.48 SPECS/nginx.spec:1.49
--- SPECS/nginx.spec:1.48	Fri Nov 30 02:51:53 2007
+++ SPECS/nginx.spec	Fri Nov 30 10:04:42 2007
@@ -66,10 +66,10 @@
 Provides:	group(nginx)
 Provides:	user(nginx)
 Provides:	webserver
-Conflicts:	%{name}-light
-Conflicts:	%{name}-mail
-Conflicts:	%{name}-perl
-Conflicts:	logrotate < 3.7-4
+#Conflicts:	%{name}-light
+#Conflicts:	%{name}-mail
+#Conflicts:	%{name}-perl
+#Conflicts:	logrotate < 3.7-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
@@ -116,9 +116,9 @@
 Provides:	group(nginx)
 Provides:	user(nginx)
 Provides:	webserver
-Conflicts:	%{name}
-Conflicts:	%{name}-mail
-Conflicts:	%{name}-perl
+#Conflicts:	%{name}
+#Conflicts:	%{name}-mail
+#Conflicts:	%{name}-perl
 
 %description light
 Nginx ("engine x") is a high-performance HTTP server and reverse
@@ -159,9 +159,9 @@
 Provides:	group(nginx)
 Provides:	user(nginx)
 Provides:	webserver
-Conflicts:	%{name}
-Conflicts:	%{name}-light
-Conflicts:	%{name}-mail
+#Conflicts:	%{name}
+#Conflicts:	%{name}-light
+#Conflicts:	%{name}-mail
 
 %description perl
 Nginx ("engine x") is a high-performance HTTP server and reverse
@@ -202,9 +202,9 @@
 Provides:	group(nginx)
 Provides:	user(nginx)
 Provides:	webserver
-Conflicts:	%{name}
-Conflicts:	%{name}-light
-Conflicts:	%{name}-perl
+#Conflicts:	%{name}
+#Conflicts:	%{name}-light
+#Conflicts:	%{name}-perl
 
 %description mail
 Nginx ("engine x") is a high-performance HTTP server and reverse
@@ -295,11 +295,12 @@
 %if %{with perl}
 ./configure \
 	--prefix=%{_prefix} \
-	--sbin-path=%{_sbindir}/%{name} \
-	--conf-path=%{_sysconfdir}/%{name}.conf \
-	--error-log-path=%{_localstatedir}/log/%{name}/error.log \
-	--pid-path=%{_localstatedir}/run/%{name}.pid \
-	--lock-path=%{_localstatedir}/lock/subsys/%{name} \
+	--sbin-path=%{_sbindir}/%{name}-perl \
+	--conf-path=%{_sysconfdir}/%{name}-perl.conf \
+	--error-log-path=%{_localstatedir}/log/%{name}/%{name}-perl_error.log \
+	--http-log-path=%{_localstatedir}/log/%{name}/%{name}-perl_access.log \
+	--pid-path=%{_localstatedir}/run/%{name}-perl.pid \
+	--lock-path=%{_localstatedir}/lock/subsys/%{name}-perl \
 	--user=nginx \
 	--group=nginx \
 	--with-http_perl_module \
@@ -317,29 +318,29 @@
 	%{?with_status:--with-http_stub_status_module} \
 	%{?with_ssl:--with-http_ssl_module} \
 	%{!?with_http_browser:--without-http_browser_module} \
-	--http-log-path=%{_localstatedir}/log/%{name}/access.log \
-	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
-	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
-	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}-perl/client_body_temp \
+	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}-perl/proxy_temp \
+	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-perl/fastcgi_temp \
 	--with-cc="%{__cc}" \
 	--with-cc-opt="%{rpmcflags}" \
 	--with-ld-opt="%{rpmldflags}"
 %{__make}
-mv -f objs/nginx contrib/nginx.perl
+mv -f objs/nginx contrib/nginx-perl
 mv -f objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs contrib/nginx.bs
 mv -f objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so contrib/nginx.so
 mv -f objs/src/http/modules/perl/nginx.pm contrib/nginx.pm
-%{__make} clean
 %endif
 
 %if %{with mail}
+%{__make} clean
 ./configure \
 	--prefix=%{_prefix} \
-	--sbin-path=%{_sbindir}/%{name} \
-	--conf-path=%{_sysconfdir}/%{name}.conf \
-	--error-log-path=%{_localstatedir}/log/%{name}/error.log \
-	--pid-path=%{_localstatedir}/run/%{name}.pid \
-	--lock-path=%{_localstatedir}/lock/subsys/%{name} \
+	--sbin-path=%{_sbindir}/%{name}-mail \
+	--conf-path=%{_sysconfdir}/%{name}-mail.conf \
+	--error-log-path=%{_localstatedir}/log/%{name}/%{name}-mail_error.log \
+	--http-log-path=%{_localstatedir}/log/%{name}/%{name}-mail_access.log \
+	--pid-path=%{_localstatedir}/run/%{name}-mail.pid \
+	--lock-path=%{_localstatedir}/lock/subsys/%{name}-mail \
 	--user=nginx \
 	--group=nginx \
 	--with-imap \
@@ -349,27 +350,27 @@
 	%{?with_poll:--with-poll_module} \
 	%{?with_rtsig:--with-rtsig_module} \
 	%{?with_select:--with-select_module} \
-	--http-log-path=%{_localstatedir}/log/%{name}/access.log \
-	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
-	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
-	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}-mail/client_body_temp \
+	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}-mail/proxy_temp \
+	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-mail/fastcgi_temp \
 	--with-cc="%{__cc}" \
 	--with-cc-opt="%{rpmcflags}" \
 	--with-ld-opt="%{rpmldflags}" \
 	%{?debug:--with-debug}
 %{__make}
-mv -f objs/nginx contrib/nginx.mail
-%{__make} clean
+mv -f objs/nginx contrib/nginx-mail
 %endif
 
 %if %{with light}
+%{__make} clean
 ./configure \
 	--prefix=%{_prefix} \
-	--sbin-path=%{_sbindir}/%{name} \
-	--conf-path=%{_sysconfdir}/%{name}.conf \
-	--error-log-path=%{_localstatedir}/log/%{name}/error.log \
-	--pid-path=%{_localstatedir}/run/%{name}.pid \
-	--lock-path=%{_localstatedir}/lock/subsys/%{name} \
+	--sbin-path=%{_sbindir}/%{name}-light \
+	--conf-path=%{_sysconfdir}/%{name}-light.conf \
+	--error-log-path=%{_localstatedir}/log/%{name}/%{name}-light_error.log \
+	--http-log-path=%{_localstatedir}/log/%{name}/%{name}-light_access.log \
+	--pid-path=%{_localstatedir}/run/%{name}-light.pid \
+	--lock-path=%{_localstatedir}/lock/subsys/%{name}-light \
 	--user=nginx \
 	--group=nginx \
 	%{?with_poll:--with-poll_module} \
@@ -382,17 +383,15 @@
 	--without-mail_pop3_module \
 	--without-mail_imap_module \
 	--without-mail_smtp_module \
-	--http-log-path=%{_localstatedir}/log/%{name}/access.log \
-	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
-	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
-	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
+	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}-light/client_body_temp \
+	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}-light/proxy_temp \
+	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}-light/fastcgi_temp \
 	--with-cc="%{__cc}" \
 	--with-cc-opt="%{rpmcflags}" \
 	--with-ld-opt="%{rpmldflags}" \
 	%{?debug:--with-debug}
 %{__make}
-mv -f objs/nginx contrib/nginx.light
-%{__make} clean
+mv -f objs/nginx contrib/nginx-light
 %endif
 
 %{__make} clean
@@ -400,7 +399,8 @@
 	--prefix=%{_prefix} \
 	--sbin-path=%{_sbindir}/%{name} \
 	--conf-path=%{_sysconfdir}/%{name}.conf \
-	--error-log-path=%{_localstatedir}/log/%{name}/error.log \
+	--error-log-path=%{_localstatedir}/log/%{name}/%{name}_error.log \
+	--http-log-path=%{_localstatedir}/log/%{name}/%{name}_access.log \
 	--pid-path=%{_localstatedir}/run/%{name}.pid \
 	--lock-path=%{_localstatedir}/lock/subsys/%{name} \
 	--user=nginx \
@@ -416,7 +416,6 @@
 	%{?with_status:--with-http_stub_status_module} \
 	%{?with_ssl:--with-http_ssl_module} \
 	%{!?with_http_browser:--without-http_browser_module} \
-	--http-log-path=%{_localstatedir}/log/%{name}/access.log \
 	--http-client-body-temp-path=%{_localstatedir}/cache/%{name}/client_body_temp \
 	--http-proxy-temp-path=%{_localstatedir}/cache/%{name}/proxy_temp \
 	--http-fastcgi-temp-path=%{_localstatedir}/cache/%{name}/fastcgi_temp \
@@ -431,7 +430,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d \
 	$RPM_BUILD_ROOT%{_nginxdir}/{cgi-bin,html,errors} \
-	$RPM_BUILD_ROOT{%{_localstatedir}/log/{%{name},archive/%{name}},%{_localstatedir}/cache/%{name}} \
+	$RPM_BUILD_ROOT%{_localstatedir}/log/{%{name},archive/%{name}} \
+	$RPM_BUILD_ROOT%{_localstatedir}/cache/{%{name},%{name}-perl,%{name}-mail,%{name}-light} \
 	$RPM_BUILD_ROOT%{_localstatedir}/lock/subsys/%{name} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,monit}
@@ -449,11 +449,11 @@
 install objs/%{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 
 %if %{with light}
-install contrib/nginx.light $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install contrib/nginx-light $RPM_BUILD_ROOT%{_sbindir}/%{name}-light
 %endif
 
 %if %{with mail}
-install contrib/nginx.mail $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install contrib/nginx-mail $RPM_BUILD_ROOT%{_sbindir}/%{name}-mail
 %endif
 
 %if %{with perl}
@@ -461,7 +461,7 @@
 install contrib/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm
 install contrib/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so
 install contrib/nginx.bs $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.bs
-install contrib/nginx.perl $RPM_BUILD_ROOT%{_sbindir}/%{name}
+install contrib/nginx-perl $RPM_BUILD_ROOT%{_sbindir}/%{name}-perl
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.default
@@ -559,19 +559,19 @@
 %if %{with mail}
 %files mail
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}-mail
 %endif
 
 %if %{with light}
 %files light
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}-light
 %endif
 
 %if %{with perl}
 %files perl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}-perl
 %dir %{perl_vendorarch}/auto/%{name}
 %attr(755,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.so
 %attr(700,root,root) %{perl_vendorarch}/auto/%{name}/%{name}.bs
@@ -588,6 +588,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2007-11-30 09:04:42  sardzent
+- burdel in progress, new concept
+
 Revision 1.48  2007-11-30 01:51:53  shadzik
 - sorted conflicts, remove one space
 
================================================================

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

More information about the pld-cvs-commit mailing list