Author: sardzent Date: Thu Nov 29 18:18:24 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - cleanup with bcond - still working
---- Files affected: SPECS: nginx.spec (1.43 -> 1.44) ---- Diffs: ================================================================ Index: SPECS/nginx.spec diff -u SPECS/nginx.spec:1.43 SPECS/nginx.spec:1.44 --- SPECS/nginx.spec:1.43 Thu Nov 29 18:52:15 2007 +++ SPECS/nginx.spec Thu Nov 29 19:18:19 2007 @@ -12,6 +12,7 @@ %bcond_without addition # adds module %bcond_without dav # WebDAV %bcond_without flv # FLV stream +%bcond_without sub # ngx_http_sub_module %bcond_without poll # poll %bcond_without realip # real ip (behind proxy) %bcond_without rtsig # rtsig @@ -24,7 +25,7 @@ Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności Name: nginx Version: 0.5.33 -Release: 0.2 +Release: 0.3 License: BSD-like Group: Networking/Daemons Source0: http://sysoev.ru/nginx/%{name}-%{version}.tar.gz @@ -149,7 +150,7 @@ Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajno�~[ci License: BSD-like Group: Networking/Daemons -URL: http://nginx.net/ +URL: http://nginx.net/ Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -233,7 +234,18 @@ %package common Summary: Configuration files and documentation for Nginx Summary(pl.UTF-8): Pliki konfiguracyjne i dokumentacja dla Nginx +License: BSD-like Group: Networking/Daemons +URL: http://nginx.net/ +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 +Conflicts: logrotate < 3.7-4 %description common Nginx ("engine x") is a high-performance HTTP server and reverse @@ -301,6 +313,7 @@ %{?with_addition:--with-http_addition_module} \ %{?with_dav:--with-http_dav_module} \ %{?with_flv:--with-http_flv_module} \ + %{?with_sub:--with-http_sub_module} \ %{?with_poll:--with-poll_module} \ %{?with_realip:--with-http_realip_module} \ %{?with_rtsig:--with-rtsig_module} \ @@ -317,6 +330,9 @@ --with-ld-opt="%{rpmldflags}" %{__make} 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 %endif %if %{with mail} @@ -333,12 +349,10 @@ --with-imap \ --with-mail \ --with-mail_ssl_module \ - %{?with_addition:--with-http_addition_module} \ + --without-http \ %{?with_poll:--with-poll_module} \ - %{?with_realip:--with-http_realip_module} \ %{?with_rtsig:--with-rtsig_module} \ %{?with_select:--with-select_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 \ @@ -397,10 +411,7 @@ %{?with_addition:--with-http_addition_module} \ %{?with_dav:--with-http_dav_module} \ %{?with_flv:--with-http_flv_module} \ - %{?with_imap:--with-imap} \ - %{?with_mail:--with-mail} \ - %{?with_mail:--with-mail_ssl_module} \ - %{?with_perl:--with-http_perl_module} \ + %{?with_sub:--with-http_sub_module} \ %{?with_poll:--with-poll_module} \ %{?with_realip:--with-http_realip_module} \ %{?with_rtsig:--with-rtsig_module} \ @@ -450,9 +461,9 @@ %if %{with perl} install -d $RPM_BUILD_ROOT{%{perl_vendorarch},%{perl_vendorarch}/auto/%{name}} -install objs/src/http/modules/perl/nginx.pm $RPM_BUILD_ROOT%{perl_vendorarch}/%{name}.pm -install objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.so -install objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs $RPM_BUILD_ROOT%{perl_vendorarch}/auto/%{name}/%{name}.bs +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} %endif @@ -548,8 +559,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.43 2007-11-29 17:52:15 sardzent -- working on +Revision 1.44 2007-11-29 18:18:19 sardzent +- cleanup with bcond +- still working Revision 1.42 2007-11-29 16:44:12 sardzent - fix with missing desc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nginx.spec?r1=1.43&r2=1.44&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
