SPECS: nginx.spec - sorted conflicts, remove one space

[shadzik]

Author: shadzik                      Date: Fri Nov 30 01:51:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sorted conflicts, remove one space

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

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.47 SPECS/nginx.spec:1.48
--- SPECS/nginx.spec:1.47	Thu Nov 29 22:43:21 2007
+++ SPECS/nginx.spec	Fri Nov 30 02:51:53 2007
@@ -66,10 +66,10 @@
 Provides:	group(nginx)
 Provides:	user(nginx)
 Provides:	webserver
-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}
@@ -537,7 +537,7 @@
 
 %files common
 %defattr(644,root,root,755)
-%doc CHANGES LICENSE README html/index.html conf/nginx.conf 
+%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}
@@ -588,6 +588,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2007-11-30 01:51:53  shadzik
+- sorted conflicts, remove one space
+
 Revision 1.47  2007-11-29 21:43:21  sardzent
 - better place for %{__make} clean
 
================================================================

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