- more "burdeling"

Changed files:
    nginx.spec -> 1.50

diff --git a/nginx.spec b/nginx.spec
index dea7ce6a4d23939445e37958df159383a6dc9752..a18ef89a9f6f39acca7ba9cbae73688fdd637f78 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -56,7 +56,7 @@ Requires(pre):        /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd

-Requires:      %{name}-common = %{version}-%{release}
+Requires:      monit

 Requires:      openssl
 Requires:      pcre
 Requires:      rc-scripts >= 0.2.0
 Requires:      openssl
 Requires:      pcre
 Requires:      rc-scripts >= 0.2.0


@@ -83,8 +83,7 @@ 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.
 
 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,
-smtp proxy.
+Common files for Nginx daemon.

 
 %description -l pl.UTF-8
 Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
 
 %description -l pl.UTF-8
 Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy


@@ -95,8 +94,7 @@ opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle
 w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
 prostej konfiguracji oraz maÅej "zasobożernoÅi".
 
 w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
 prostej konfiguracji oraz maÅej "zasobożernoÅi".
 

-To jest standardowa wersja nginx, bez obs³ugi perla oraz proxy dla
-imap, pop3, smtp.
+Niezb¿dne pliki dla Nginx.

 
 %package light
 Summary:       High perfomance HTTP and reverse proxy server
 
 %package light
 Summary:       High perfomance HTTP and reverse proxy server


@@ -107,7 +105,7 @@ URL:                http://nginx.net/
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel

-Requires:      %{name}-common = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}

 Requires:      openssl
 Requires:      pcre
 Requires:      zlib
 Requires:      openssl
 Requires:      pcre
 Requires:      zlib


@@ -120,26 +118,10 @@ Provides: webserver
 #Conflicts:    %{name}-perl
 
 %description light
 #Conflicts:    %{name}-perl
 
 %description light

-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.
-

 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
 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

-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx został napisany przez Igora Sysoev'a
-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ÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-

 Najmniejsza i najszybsza wersja Nginx. Bez wsparcia dla Perla,
 DAV, FLV oraz IMAP, POP3, SMTP proxy.
 
 Najmniejsza i najszybsza wersja Nginx. Bez wsparcia dla Perla,
 DAV, FLV oraz IMAP, POP3, SMTP proxy.
 


@@ -152,7 +134,7 @@ URL:                http://nginx.net/
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel

-Requires:      %{name}-common = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}

 Requires:      openssl
 Provides:      group(http)
 Provides:      group(nginx)
 Requires:      openssl
 Provides:      group(http)
 Provides:      group(nginx)


@@ -163,25 +145,9 @@ Provides:  webserver
 #Conflicts:    %{name}-mail
 
 %description perl
 #Conflicts:    %{name}-mail
 
 %description perl

-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.
-

 Nginx with Perl support. Mail modules not included.
 
 %description perl -l pl.UTF-8
 Nginx with Perl support. Mail modules not included.
 
 %description perl -l pl.UTF-8

-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx został napisany przez Igora Sysoev'a
-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ÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-

 Nignx z obsługą Perla. Bez wsparcia dla modułów poczty.
 
 %package mail
 Nignx z obsługą Perla. Bez wsparcia dla modułów poczty.
 
 %package mail


@@ -193,7 +159,7 @@ URL:                http://nginx.net/
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel

-Requires:      %{name}-common = %{version}-%{release}
+Requires:      %{name} = %{version}-%{release}

 Requires:      openssl
 Requires:      pcre
 Requires:      zlib
 Requires:      openssl
 Requires:      pcre
 Requires:      zlib


@@ -206,28 +172,12 @@ Provides: webserver
 #Conflicts:    %{name}-perl
 
 %description mail
 #Conflicts:    %{name}-perl
 
 %description mail

-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.
-

 Nginx with mail support. Only mail modules included.
 
 %description mail -l pl.UTF-8
 Nginx with mail support. Only mail modules included.
 
 %description mail -l pl.UTF-8

-Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
-a także IMAP/POP3 proxy. Nginx został napisany przez Igora Sysoev'a
-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ÄÅ dzieki stabilnoÅi, bogactwu dodatków,
-prostej konfiguracji oraz maÅej "zasobożernoÅi".
-

 Nginx ze wsparciem tylko dla modułów poczty.
 
 Nginx ze wsparciem tylko dla modułów poczty.
 

-%package common
+%package standard

 Summary:       Configuration files and documentation for Nginx
 Summary(pl.UTF-8):     Pliki konfiguracyjne i dokumentacja dla Nginx
 License:       BSD-like
 Summary:       Configuration files and documentation for Nginx
 Summary(pl.UTF-8):     Pliki konfiguracyjne i dokumentacja dla Nginx
 License:       BSD-like


@@ -236,14 +186,10 @@ URL:              http://nginx.net/
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 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 >= 0.2.0
+Requires:      %{name} = %{version}-%{release}

 Conflicts:     logrotate < 3.7-4
 
 Conflicts:     logrotate < 3.7-4
 

-%description common
+%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
 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


@@ -252,9 +198,10 @@ 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.
 
 beta, Nginx is known for its stability, rich feature set, simple
 configuration, and low resource consumption.
 

-Common files for Nginx daemon.
+This is standard nginx version, without perl support and imap, pop3,
+smtp proxy. 

 
 

-%description common -l pl.UTF-8
+%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 Sysoev'a
 na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości
 Nginx ("engine x") jest wysokowydajnym serwerem HTTP, odwrotnym proxy
 a także IMAP/POP3 proxy. Nginx został napisany przez Igora Sysoev'a
 na potrzeby serwisu Rambler.ru. Jest to drugi pod względem ilości


@@ -263,7 +210,8 @@ opublikował źródła na licencji BSD. Mimo, że projekt jest ciągle
 w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
 prostej konfiguracji oraz maÅej "zasobożernoÅi".
 
 w fazie beta, już zasÅynÄÅ dzieki stabilnoÅi, bogactwu dodatków,
 prostej konfiguracji oraz maÅej "zasobożernoÅi".
 

-Niezbedne pliki dla Nginx.
+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
 
 %package -n monit-rc-nginx
 Summary:       Nginx support for monit


@@ -272,7 +220,10 @@ License:   BSD-like
 Group:         Applications/System
 URL:           http://nginx.eu/
 Requires:      %{name} = %{version}-%{release}
 Group:         Applications/System
 URL:           http://nginx.eu/
 Requires:      %{name} = %{version}-%{release}

-Requires:      monit
+Provides:       group(http)
+Provides:       group(nginx)
+Provides:       user(nginx)
+Provides:       webserver

 
 %description -n monit-rc-nginx
 monitrc file for monitoring Nginx webserver server.
 
 %description -n monit-rc-nginx
 monitrc file for monitoring Nginx webserver server.


@@ -469,13 +420,13 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/html
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%pre common
+%pre

 %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
 
 %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 common
+%post

 for a in access.log error.log; do
        if [ ! -f /var/log/%{name}/$a ]; then
                touch /var/log/%{name}/$a
 for a in access.log error.log; do
        if [ ! -f /var/log/%{name}/$a ]; then
                touch /var/log/%{name}/$a


@@ -484,7 +435,7 @@ for a in access.log error.log; do
        fi
 done
 
        fi
 done
 

-%pre
+%pre standard

 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 


@@ -500,7 +451,7 @@ done
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 

-%preun
+%preun standard

 if [ "$1" = "0" ]; then
        %service -q %{name} stop
        /sbin/chkconfig --del %{name}
 if [ "$1" = "0" ]; then
        %service -q %{name} stop
        /sbin/chkconfig --del %{name}


@@ -524,7 +475,7 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
        /sbin/chkconfig --del %{name}
 fi
 

-%postun common
+%postun

 if [ "$1" = "0" ]; then
        %userremove %{name}
        %groupremove %{name}
 if [ "$1" = "0" ]; then
        %userremove %{name}
        %groupremove %{name}


@@ -532,10 +483,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_sbindir}/%{name}
-
-%files common
-%defattr(644,root,root,755)

 %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}
 %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}


@@ -555,6 +502,10 @@ fi
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/*
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/errors/*
 
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/html/*
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_nginxdir}/errors/*
 

+%files standard
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/%{name}
+

 %if %{with mail}
 %files mail
 %defattr(644,root,root,755)
 %if %{with mail}
 %files mail
 %defattr(644,root,root,755)