From 74eda1c4202519c834444e434c58b978848cc6dfaaf9239c0ecb740912c1b4ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Sat, 14 Jun 2014 11:02:59 +0000
Subject: [PATCH] Accepting request 236476 from home:lrupp:branches:server:http
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- use zip file downloaded from github directly, as requested by
  Tomáš Chvátal

- add and include FancyIndex module (with conditional)
- explicit enable http_ssl_module

OBS-URL: https://build.opensuse.org/request/show/236476
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=45
---
 nginx.changes | 12 ++++++++++++
 nginx.spec    | 21 +++++++++++++++++++--
 v0.3.3.zip    |  3 +++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 v0.3.3.zip

diff --git a/nginx.changes b/nginx.changes
index 2847883..9438082 100644
--- a/nginx.changes
+++ b/nginx.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Jun  6 13:54:27 UTC 2014 - lars@linux-schulserver.de
+
+- use zip file downloaded from github directly, as requested by 
+  Tomáš Chvátal
+
+-------------------------------------------------------------------
+Mon May  5 10:24:04 UTC 2014 - lars@linux-schulserver.de
+
+- add and include FancyIndex module (with conditional)
+- explicit enable http_ssl_module
+
 -------------------------------------------------------------------
 Wed Mar 19 10:04:14 UTC 2014 - aj@ajaissle.de
 
diff --git a/nginx.spec b/nginx.spec
index f4eeb8c..41ac68f 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -38,6 +38,7 @@ Release:        0
 %define ngx_tmp_scgi   %{ngx_home}/scgi/
 %define ngx_tmp_uwsgi  %{ngx_home}/uwsgi/
 %define ngx_user_group nginx
+%define fancyindex_version 0.3.3
 %define with_cpp_test  0
 %define with_google_perftools 0
 %if 0%{?suse_version} >= 1110
@@ -47,6 +48,7 @@ Release:        0
 # passenger is required by webyast
 %define with_passenger 1
 %endif
+%define with_fancyindex 1
 #
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -69,6 +71,7 @@ BuildRequires:  curl-devel
 BuildRequires:  ruby-devel
 BuildRequires:  rubygem-passenger
 BuildRequires:  rubygem-passenger-devel-static
+BuildRequires:  unzip
 Recommends:     packageand(rubygem-passenger:rubygem-passenger-nginx)
 %endif
 %if 0%{?suse_version} >= 1210
@@ -89,6 +92,7 @@ Source:         http://nginx.org/download/nginx-%{version}.tar.gz
 Source1:        nginx.init
 Source2:        nginx.logrotate
 Source3:        nginx.service
+Source4:        https://github.com/aperezdc/ngx-fancyindex/archive/v%{fancyindex_version}.zip
 Source100:      nginx.rpmlintrc
 # PATCH-FIX-UPSTREAM nginx-0.4.0-no_Werror.patch
 Patch:          nginx-0.4.0-no_Werror.patch
@@ -126,7 +130,7 @@ Author:
     Igor Sysoev
 
 %prep
-%setup -n %{pkg_name}-%{version}
+%setup -n %{pkg_name}-%{version} -b4
 %patch
 %patch2
 %patch3
@@ -146,6 +150,12 @@ fi
 %endif
 %patch7
 %endif
+%if 0%{with_fancyindex}
+mkdir -p ngx-fancyindex-%{fancyindex_version}
+pushd ../ngx-fancyindex-%{fancyindex_version}
+cp -r template* LICENSE *.rst $RPM_BUILD_DIR/%{pkg_name}-%{version}/ngx-fancyindex-%{fancyindex_version}/
+popd
+%endif
 
 %build
 ./configure                                    \
@@ -184,6 +194,7 @@ fi
   --with-http_gzip_static_module               \
   --with-http_random_index_module              \
   --with-http_secure_link_module               \
+  --with-http_ssl_module                       \
   --with-http_degradation_module               \
   --with-http_stub_status_module               \
   --with-http_perl_module                      \
@@ -203,6 +214,9 @@ fi
   %if 0%{?with_cpp_test}
   --with-cpp_test_module                       \
   %endif
+  %if 0%{with_fancyindex}
+  --add-module=../ngx-fancyindex-%{fancyindex_version} \
+  %endif
   --with-md5=/usr                              \
   --with-sha1=/usr                             \
 %if 0%{?suse_version} > 1000 || 0%{?fedora_version} > 4 || 0%{?mandriva_version} > 2006
@@ -297,7 +311,10 @@ make install DESTDIR="%buildroot"
 %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_scgi}
 %dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{ngx_tmp_uwsgi}
 %doc CHANGES*
-%doc conf/ contrib/
+%doc conf/ contrib/ 
+%if 0%{with_fancyindex}
+%doc ngx-fancyindex-%{fancyindex_version}/
+%endif
 %if 0%{?has_systemd}
 %{_unitdir}/nginx.service
 %endif
diff --git a/v0.3.3.zip b/v0.3.3.zip
new file mode 100644
index 0000000..fa0f937
--- /dev/null
+++ b/v0.3.3.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f90583b719380da4fe21f61ba868d3145221044f77f1c1997715bb0f22a1706
+size 16981