SPECS: nginx.spec - more "burdeling"
shadzik
shadzik at pld-linux.org
Fri Nov 30 15:22:42 CET 2007
Author: shadzik Date: Fri Nov 30 14:22:42 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- more "burdeling"
---- Files affected:
SPECS:
nginx.spec (1.49 -> 1.50)
---- Diffs:
================================================================
Index: SPECS/nginx.spec
diff -u SPECS/nginx.spec:1.49 SPECS/nginx.spec:1.50
--- SPECS/nginx.spec:1.49 Fri Nov 30 10:04:42 2007
+++ SPECS/nginx.spec Fri Nov 30 15:22:37 2007
@@ -57,7 +57,7 @@
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
@@ -84,8 +84,7 @@
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
@@ -96,8 +95,7 @@
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
@@ -108,7 +106,7 @@
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
@@ -121,26 +119,10 @@
#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
-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.
@@ -153,7 +135,7 @@
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)
@@ -164,25 +146,9 @@
#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 ("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
@@ -194,7 +160,7 @@
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
@@ -207,28 +173,12 @@
#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 ("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.
-%package common
+%package standard
Summary: Configuration files and documentation for Nginx
Summary(pl.UTF-8): Pliki konfiguracyjne i dokumentacja dla Nginx
License: BSD-like
@@ -237,14 +187,10 @@
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
-%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
@@ -253,9 +199,10 @@
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
@@ -264,7 +211,8 @@
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
@@ -273,7 +221,10 @@
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.
@@ -470,13 +421,13 @@
%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
-%post common
+%post
for a in access.log error.log; do
if [ ! -f /var/log/%{name}/$a ]; then
touch /var/log/%{name}/$a
@@ -485,7 +436,7 @@
fi
done
-%pre
+%pre standard
/sbin/chkconfig --add %{name}
%service %{name} restart
@@ -501,7 +452,7 @@
/sbin/chkconfig --add %{name}
%service %{name} restart
-%preun
+%preun standard
if [ "$1" = "0" ]; then
%service -q %{name} stop
/sbin/chkconfig --del %{name}
@@ -525,7 +476,7 @@
/sbin/chkconfig --del %{name}
fi
-%postun common
+%postun
if [ "$1" = "0" ]; then
%userremove %{name}
%groupremove %{name}
@@ -533,10 +484,6 @@
%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}
@@ -556,6 +503,10 @@
%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)
@@ -588,6 +539,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.50 2007-11-30 14:22:37 shadzik
+- more "burdeling"
+
Revision 1.49 2007-11-30 09:04:42 sardzent
- burdel in progress, new concept
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nginx.spec?r1=1.49&r2=1.50&f=u
More information about the pld-cvs-commit
mailing list