SPECS: nginx.spec - fixed config file duplicates - some typo - for...

Sun Dec 2 18:35:09 CET 2007

Author: sardzent                     Date: Sun Dec  2 17:35:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed config file duplicates
- some typo
- for now on its 'nginx'

---- Files affected:
SPECS:
   nginx.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.75 SPECS/nginx.spec:1.76

--- SPECS/nginx.spec:1.75	Sun Dec  2 00:56:36 2007
+++ SPECS/nginx.spec	Sun Dec  2 18:35:03 2007
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - fix sysconfdir duplicates
 # - /etc/sysconfig/nginx file
 # - missing perl build/install requires
 # - nginx should have own group (and work with it) or use http group ?
@@ -83,26 +82,26 @@
 %define		_nginxdir	/home/services/%{name}
 
 %description
-Nginx ("engine x") is a high-performance HTTP server and reverse
-proxy, as well as an IMAP/POP3 proxy server. Nginx was written by Igor
+nginx ("engine x") is a high-performance HTTP server and reverse
+proxy, as well as an IMAP/POP3 proxy server. nginx was written by Igor
 Sysoev for Rambler.ru, Russia's second-most visited website, where it
 has been running in production for over two and a half years. Igor has
 released the source code under a BSD-like license. Although still in
-beta, Nginx is known for its stability, rich feature set, simple
+beta, nginx is known for its stability, rich feature set, simple
 configuration, and low resource consumption.
 
-Common files for Nginx daemon.
+Common files for nginx daemon.
 
 %description -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a takÅ¼e IMAP/POP3 proxy. Nginx zostaÅ‚ napisany przez Igora Sysoeva
+nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
+a takÅ¼e IMAP/POP3 proxy. nginx zostaÅ‚ napisany przez Igora Sysoeva
 na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ™dem iloÅ›ci
 odwiedzin serwis w Rosji i dziaÅ‚a od ponad dwÃ³ch i pÃ³Å‚ roku. Igor
 opublikowaÅ‚ ÅºrÃ³dÅ‚a na licencji BSD. Mimo, Å¼e projekt jest ciÄ…gle
 w fazie beta, juÅ¼ zasÅ‚ynÄ…Å‚ dziÄ™ki stabilnoÅ›ci, bogactwu dodatkÃ³w,
 prostej konfiguracji oraz maÅ‚ej "zasoboÅ¼ernoÅ›ci".
 
-NiezbÄ™dne pliki dla Nginx.
+NiezbÄ™dne pliki dla nginx.
 
 %package light
 Summary:	High perfomance HTTP and reverse proxy server
@@ -122,11 +121,11 @@
 Provides:	webserver
 
 %description light
-The smallest, but also the fastest Nginx edition. No additional
+The smallest, but also the fastest nginx edition. No additional
 modules, no Perl, no DAV, no FLV, no IMAP, POP3, SMTP proxy.
 
 %description light -l pl.UTF-8
-Najmniejsza i najszybsza wersja Nginx. Bez wsparcia dla Perla, DAV,
+Najmniejsza i najszybsza wersja nginx. Bez wsparcia dla Perla, DAV,
 FLV oraz IMAP, POP3, SMTP proxy.
 
 %package perl
@@ -145,14 +144,14 @@
 Provides:	webserver
 
 %description perl
-Nginx with Perl support. Mail modules not included.
+nginx with Perl support. Mail modules not included.
 
 %description perl -l pl.UTF-8
-Nignx z obsÅ‚ugÄ… Perla. Bez wsparcia dla moduÅ‚Ã³w poczty.
+nginx z obsÅ‚ugÄ… Perla. Bez wsparcia dla moduÅ‚Ã³w poczty.
 
 %package mail
-Summary:	High perfomance HTTP and reverse proxy server
-Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajnoÅ›ci
+Summary:	High perfomance IMAP, POP3, SMTP proxy server
+Summary(pl.UTF-8):	IMAP, POP3, SMTP proxy o wysokiej wydajnoÅ›ci
 Group:		Networking/Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -168,14 +167,14 @@
 Provides:	webserver
 
 %description mail
-Nginx with mail support. Only mail modules included.
+nginx with mail support. Only mail modules included.
 
 %description mail -l pl.UTF-8
-Nginx ze wsparciem tylko dla moduÅ‚Ã³w poczty.
+nginx ze wsparciem tylko dla moduÅ‚Ã³w poczty.
 
 %package standard
-Summary:	Configuration files and documentation for Nginx
-Summary(pl.UTF-8):	Pliki konfiguracyjne i dokumentacja dla Nginx
+Summary:	High perfomance HTTP and reverse proxy server
+Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajnoÅ~[ci
 Group:		Networking/Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -188,42 +187,26 @@
 Conflicts:	logrotate < 3.7-4
 
 %description standard
-Nginx ("engine x") is a high-performance HTTP server and reverse
-proxy, as well as an IMAP/POP3 proxy server. Nginx was written by Igor
-Sysoev for Rambler.ru, Russia's second-most visited website, where it
-has been running in production for over two and a half years. Igor has
-released the source code under a BSD-like license. Although still in
-beta, Nginx is known for its stability, rich feature set, simple
-configuration, and low resource consumption.
-
-This is standard Nginx version, without Perl support and IMAP, POP3,
+This is standard nginx version, without Perl support and IMAP, POP3,
 SMTP proxy. 
 
 %description standard -l pl.UTF-8
-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a takÅ¼e IMAP/POP3 proxy. Nginx zostaÅ‚ napisany przez Igora Sysoeva
-na potrzeby serwisu Rambler.ru. Jest to drugi pod wzglÄ™dem iloÅ›ci
-odwiedzin serwis w Rosji i dziaÅ‚a od ponad dwÃ³ch i pÃ³Å‚ roku. Igor
-opublikowaÅ‚ ÅºrÃ³dÅ‚a na licencji BSD. Mimo, Å¼e projekt jest ciÄ…gle
-w fazie beta, juÅ¼ zasÅ‚ynÄ…Å‚ dziÄ™ki stabilnoÅ›ci, bogactwu dodatkÃ³w,
-prostej konfiguracji oraz maÅ‚ej "zasoboÅ¼ernoÅ›ci".
-
-To jest standardowa wersja Nginx, bez obsÅ‚ugi Perla oraz proxy dla
+To jest standardowa wersja nginx, bez obsÅ‚ugi Perla oraz proxy dla
 IMAP, POP3, SMTP.
 
 %package -n monit-rc-nginx
-Summary:	Nginx support for monit
-Summary(pl.UTF-8):	Wsparcie Nginx dla monit
+Summary:	nginx support for monit
+Summary(pl.UTF-8):	Wsparcie nginx dla monit
 Group:		Applications/System
 URL:		http://nginx.eu/
 Requires:	%{name} = %{version}-%{release}
 Requires:	monit
 
 %description -n monit-rc-nginx
-monitrc file for monitoring Nginx webserver server.
+monitrc file for monitoring nginx webserver.
 
 %description -n monit-rc-nginx -l pl.UTF-8
-Plik monitrc do monitorowania serwera WWW Nginx.
+Plik monitrc do monitorowania serwera WWW nginx.
 
 %prep
 %setup -q
@@ -377,8 +360,10 @@
 	$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}} \
 	$RPM_BUILD_ROOT/etc/{logrotate.d,monit}
 
-install conf/* $RPM_BUILD_ROOT%{_sysconfdir}
 install conf/fastcgi_params $RPM_BUILD_ROOT%{_sysconfdir}/fastcgi.params
+install conf/koi-utf $RPM_BUILD_ROOT%{_sysconfdir}/koi-utf
+install conf/koi-win $RPM_BUILD_ROOT%{_sysconfdir}/koi-win
+install conf/win-utf $RPM_BUILD_ROOT%{_sysconfdir}/win-utf
 install html/index.html $RPM_BUILD_ROOT%{_nginxdir}/html
 install html/50x.html $RPM_BUILD_ROOT%{_nginxdir}/errors
 install %{SOURCE1} $RPM_BUILD_ROOT%{_nginxdir}/html/favicon.ico
@@ -451,7 +436,7 @@
 done
 /sbin/chkconfig --add %{name}-light
 %service %{name}-light restart
-echo 'NOTE: daemon is now using "/etc/nginx/nginx-light.conf" file'
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-light.conf" as config'
 
 %post perl
 for a in access.log error.log; do
@@ -464,7 +449,7 @@
 done
 /sbin/chkconfig --add %{name}-perl
 %service %{name}-perl restart
-echo 'NOTE: daemon is now using "/etc/nginx/nginx-perl.conf" file'
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-perl.conf" as config'
 
 %post mail
 for a in access.log error.log; do
@@ -477,7 +462,7 @@
 done
 /sbin/chkconfig --add %{name}-mail
 %service %{name}-mail restart
-echo 'NOTE: daemon is now using "/etc/nginx/nginx-mail.conf" file'
+echo 'NOTE: daemon is now using "/etc/nginx/nginx-mail.conf" as config'
 
 %preun standard
 if [ "$1" = "0" ];then
@@ -520,9 +505,12 @@
 %dir %{_nginxdir}/errors
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 # XXX: duplicates, don't use such glob here
-%attr(640,root,root) %{_sysconfdir}/*[_-]*
+#%attr(640,root,root) %{_sysconfdir}/*[_-]*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/proxy.conf
 %attr(640,root,root) %{_sysconfdir}/mime.types
+%attr(640,root,root) %{_sysconfdir}/koi-utf
+%attr(640,root,root) %{_sysconfdir}/koi-win
+%attr(640,root,root) %{_sysconfdir}/win-utf
 %attr(750,root,root) %dir /var/log/archive/%{name}
 %attr(750,%{name},logs) /var/log/%{name}
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/*
@@ -585,6 +573,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2007-12-02 17:35:03  sardzent
+- fixed config file duplicates
+- some typo
+- for now on its 'nginx'
+
 Revision 1.75  2007-12-01 23:56:36  qboosh
 - sufficient optflags come from rpm, no need for -with-cpu-opt
 
================================================================

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

