Changes - j0ke.net Open Build Service

Changes of Revision 27

[-] [+]	Changed	nginx-SLE_11_SP1.spec
@@ -11,7 +11,7 @@ # norootforbuild Name: nginx -Version: 1.4.2 +Version: 1.5.6 Release: 1 # %define pkg_name nginx @@ -29,6 +29,15 @@ %define ngx_tmp_proxy %{ngx_home}/proxy/ %define ngx_tmp_fcgi %{ngx_home}/fastcgi/ %define ngx_user_group nginx +%define rtmp_ext nginx-rtmp-module +%define rtmp_ext_version 1.0.5 +%define rtmp %{rtmp_ext}-%{rtmp_ext_version} +%define rtmp_nover %{rtmp_ext} +%define with_rtmp_ext 1 +%define sticky_module_version 1.1 + + + # License: BSD Group: Productivity/Networking/Web/Proxy @@ -44,12 +53,19 @@ Source: http://sysoev.ru/nginx/nginx-%{version}.tar.gz Source1: nginx.init.suse Source2: nginx.logrotate +Source8: ngx_slowfs_cache-1.5.tar.gz +Source9: Nginx-limit-traffic-rate-module.tar.gz +Source10: %{rtmp}.tar.bz2 +Source11: nginx_upstream_check_module-master.tar.gz + Patch: nginx-0.4.0-no_Werror.patch Patch1: nginx-0.6.31-DESTDIR.patch Patch2: check_1.2.6+.patch Patch2: nginx-0.6.38-html.patch -#Patch3: nginx-0.4.0-perl_vendor_install.patch +#Patch3: nginx-0.4.0-perl_vendor_install.patch Patch4: nginx-0.6.31_default_config.patch + + # Summary: A HTTP server and IMAP/POP3 proxy server %description @@ -108,13 +124,22 @@ --with-sha1=/usr \ --with-file-aio \ --with-http_spdy_module \ -%if 0%{?suse_version} > 1000 \|\| 0%{?fedora_version} > 4 \|\| 0%{?mandriva_version} > 2006 - --with-cc-opt="%{optflags} -fstack-protector" -%else - --with-cc-opt="%{optflags}" + --with-cc-opt="%{optflags} -fstack-protector" \ + --with-cc-opt="%{optflags}" \ + --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \ + --add-module=%{_builddir}/nginx-%{version}/nginx_upstream_check_module-master \ +%if 0%{with_rtmp_ext} + --add-module=%{_builddir}/nginx-%{version}/%{rtmp} \ %endif + --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module \ + --with-file-aio + + %{__make} +mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair + + %install %makeinstall %perl_process_packlist @@ -180,7 +205,7 @@ %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}/tmp/ %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}/proxy/ %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_home}/fastcgi/ -%doc CHANGES* LICENSE README +%doc CHANGES* LICENSE README nginx-upstream-fair/README.nginx-upstream-fair %doc conf/ contrib/ %changelog