[nginx/epel7: 4/5] Revert "Create nginx-filesystem subpackage (patch from Remi Collet)"

[Jamie Nguyen]

commit 09d71762bc181648c35996b036b72152583b4623
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Oct 22 20:14:35 2014 +0100

    Revert "Create nginx-filesystem subpackage (patch from Remi Collet)"
    
    This reverts commit aa7abdd0d666fcfa45517b0ca362ab6518c57509.

 nginx.spec |   30 ++++--------------------------
 1 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index d69da91..74a73d8 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -27,7 +27,7 @@
 Name:              nginx
 Epoch:             1
 Version:           1.6.2
-Release:           2%{?dist}
+Release:           1%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -66,14 +66,12 @@ BuildRequires:     pcre-devel
 BuildRequires:     perl-devel
 BuildRequires:     perl(ExtUtils::Embed)
 BuildRequires:     zlib-devel
-
-Requires:          nginx-filesystem = %{epoch}:%{version}-%{release}
 Requires:          GeoIP
 Requires:          gd
 Requires:          openssl
 Requires:          pcre
 Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires(pre):     nginx-filesystem
+Requires(pre):     shadow-utils
 Provides:          webserver
 
 %if 0%{?with_systemd}
@@ -92,17 +90,6 @@ Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
 IMAP protocols, with a strong focus on high concurrency, performance and low
 memory usage.
 
-%package filesystem
-Group:             System Environment/Daemons
-Summary:           The basic directory layout for the Nginx server
-BuildArch:         noarch
-Requires(pre):     shadow-utils
-
-%description filesystem
-The nginx-filesystem package contains the basic directory layout
-for the Nginx server including the correct permissions for the
-directories.
-
 
 %prep
 %setup -q
@@ -212,7 +199,7 @@ install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
 install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
 
 
-%pre filesystem
+%pre
 getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group}
 getent passwd %{nginx_user} > /dev/null || \
     useradd -r -d %{nginx_home} -g %{nginx_group} \
@@ -255,7 +242,7 @@ fi
 
 %files
 %doc LICENSE CHANGES README
-%{nginx_datadir}/html/*
+%{nginx_datadir}/
 %{_bindir}/nginx-upgrade
 %{_sbindir}/nginx
 %{_mandir}/man3/nginx.3pm*
@@ -292,17 +279,8 @@ fi
 %attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
 %attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
 
-%files filesystem
-%dir %{nginx_datadir}
-%dir %{nginx_datadir}/html
-%dir %{nginx_confdir}
-%dir %{nginx_confdir}/conf.d
-
 
 %changelog
-* Mon Sep 22 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.6.2-2
-- create nginx-filesystem subpackage (patch from Remi Collet)
-
 * Wed Sep 17 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 1:1.6.2-1
 - update to upstream release 1.6.2
 - CVE-2014-3616 nginx: virtual host confusion (#1142573)