[httpd: 2/2] fix creating apache user in pre script (#1128328)

[Jan Kaluža]

commit 34169cb8c8e8e28439e02f52f42d115deea2d831
Merge: bb13a67 b46475b
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Thu Aug 14 19:45:12 2014 +0200

    fix creating apache user in pre script (#1128328)

 .gitignore                 |    1 +
 00-base.conf               |   15 +--------------
 00-optional.conf           |   17 +++++++++++++++++
 httpd-2.4.7-r1537535.patch |   38 --------------------------------------
 httpd-2.4.9-r1573626.patch |   29 -----------------------------
 httpd.spec                 |   30 ++++++++++++++++++++++--------
 sources                    |    2 +-
 7 files changed, 42 insertions(+), 90 deletions(-)
---
diff --cc httpd.spec
index 58a9144,7c5c814..dfadc67
--- a/httpd.spec
+++ b/httpd.spec
@@@ -13,8 -13,8 +13,8 @@@
  
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.4.9
- Release: 9%{?dist}
+ Version: 2.4.10
 -Release: 2%{?dist}
++Release: 3%{?dist}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
@@@ -652,9 -653,14 +658,17 @@@ rm -rf $RPM_BUILD_ROO
  %{_rpmconfigdir}/macros.d/macros.httpd
  
  %changelog
- * Thu Aug 14 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.9-9
++* Thu Aug 14 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.10-3
 +- fix creating apache user in pre script (#1128328)
 +
+ * Thu Jul 31 2014 Joe Orton <jorton at redhat.com> - 2.4.10-2
+ - enable mod_request by default for mod_auth_form
+ - move disabled-by-default modules from 00-base.conf to 00-optional.conf
+ 
+ * Mon Jul 21 2014 Joe Orton <jorton at redhat.com> - 2.4.10-1
+ - update to 2.4.10
+ - expand variables in docdir example configs
+ 
  * Tue Jul 08 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.9-8
  - add support for systemd socket activation (#1111648)