[httpd: 2/2] merge

[jorton]

commit 271938ce0c902ca7d4dfdfffca0b8d23971adbba
Merge: d8220f4 a0a00e7
Author: Joe Orton <jorton at redhat.com>
Date:   Thu Sep 13 16:50:50 2012 +0100

    merge

 00-systemd.conf               |    2 +
 httpd-2.4.3-mod_systemd.patch |  175 +++++++++++++++++++++++++++++++++++++++++
 httpd.service                 |    5 +-
 httpd.spec                    |   13 +++-
 4 files changed, 189 insertions(+), 6 deletions(-)
---
diff --cc httpd.spec
index a7896a9,1afc337..e9aaadf
--- a/httpd.spec
+++ b/httpd.spec
@@@ -8,7 -8,7 +8,7 @@@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.4.3
--Release: 3%{?dist}
++Release: 4%{?dist}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
@@@ -574,9 -578,9 +578,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_sysconfdir}/rpm/macros.httpd
  
  %changelog
- * Thu Sep 13 2012 Joe Orton <jorton at redhat.com> - 2.4.3-3
++* Thu Sep 13 2012 Joe Orton <jorton at redhat.com> - 2.4.3-4
 +- use IncludeOptional for conf.d/*.conf inclusion
 +
+ * Fri Sep 07 2012 Jan Kaluza <jkaluza at redhat.com> - 2.4.3-3
+ - adding mod_systemd to integrate with systemd better
+ 
  * Tue Aug 21 2012 Joe Orton <jorton at redhat.com> - 2.4.3-2
  - mod_ssl: add check for proxy keypair match (upstream r1374214)