[mod_lookup_identity] Rebase to 0.9.2.

[Jan Pazdziora]

commit 8be877d042d54332047295c7db3066fec51a1381
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Mon Jun 30 08:38:25 2014 +0200

    Rebase to 0.9.2.

 .gitignore               |    1 +
 mod_lookup_identity.spec |   26 ++++++++++++++++----------
 sources                  |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6f9ca9..a7a9fda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mod_lookup_identity-0.8.3.tar.gz
 /mod_lookup_identity-0.9.0.tar.gz
 /mod_lookup_identity-0.9.1.tar.gz
+/mod_lookup_identity-0.9.2.tar.gz
diff --git a/mod_lookup_identity.spec b/mod_lookup_identity.spec
index e4ffa8f..3681ed7 100644
--- a/mod_lookup_identity.spec
+++ b/mod_lookup_identity.spec
@@ -7,8 +7,8 @@
 
 Summary: Apache module to retrieve additional information about the authenticated user
 Name: mod_lookup_identity
-Version: 0.9.1
-Release: 2%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Daemons
 URL: http://www.adelton.com/apache/mod_lookup_identity/
@@ -35,6 +35,14 @@ Use of REMOTE_USER_* environment variables is recommended.
 
 %build
 %{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99 $(pkg-config --cflags dbus-1)" $(pkg-config --libs dbus-1) mod_lookup_identity.c
+%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
+echo > lookup_identity.confx
+echo "# Load the module in %{_httpd_modconfdir}/55-lookup_identity.conf" >> lookup_identity.confx
+cat lookup_identity.conf >> lookup_identity.confx
+%else
+cat lookup_identity.module > lookup_identity.confx
+cat lookup_identity.conf >> lookup_identity.confx
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,24 +50,22 @@ install -Dm 755 .libs/mod_lookup_identity.so $RPM_BUILD_ROOT%{_httpd_moddir}/mod
 
 %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
 # httpd >= 2.4.x
-install -Dp -m 0644 lookup_identity.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-lookup_identity.conf
-%else
-# httpd <= 2.2.x
-install -Dp -m 0644 lookup_identity.conf $RPM_BUILD_ROOT%{_httpd_confdir}/lookup_identity.conf
+install -Dp -m 0644 lookup_identity.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-lookup_identity.conf
 %endif
+install -Dp -m 0644 lookup_identity.confx $RPM_BUILD_ROOT%{_httpd_confdir}/lookup_identity.conf
 
 %files
 %doc README LICENSE
 %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
 %config(noreplace) %{_httpd_modconfdir}/55-lookup_identity.conf
-%else
-%config(noreplace) %{_httpd_confdir}/lookup_identity.conf
 %endif
+%config(noreplace) %{_httpd_confdir}/lookup_identity.conf
 %{_httpd_moddir}/*.so
 
 %changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Fri Jun 27 2014 Jan Pazdziora <jpazdziora at redhat.com> - 0.9.2-1
+- Fix error handling and reporting.
+- Fix module loading/configuration for Apache 2.4.
 
 * Tue May 13 2014 Jan Pazdziora <jpazdziora at redhat.com> - 0.9.1-1
 - Address code issues revealed by coverity scan.
diff --git a/sources b/sources
index 9887959..444f495 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2469e96c0aca3b35cbc93deab9d2003  mod_lookup_identity-0.9.1.tar.gz
+0160d7e88141784cb6576a73381a6db2  mod_lookup_identity-0.9.2.tar.gz