From fee0f80576cff3910b561833d246b0c9b5126cce Mon Sep 17 00:00:00 2001
From: Adam Miller <maxamillion@fedoraproject.org>
Date: Sep 02 2016 21:11:06 +0000
Subject: fix up EPEL6 conditionals for 1.1 update


---

diff --git a/mod_auth_cas.spec b/mod_auth_cas.spec
index 27f48d3..861bc18 100644
--- a/mod_auth_cas.spec
+++ b/mod_auth_cas.spec
@@ -8,7 +8,7 @@
 
 Name:           mod_auth_cas
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache 2.2/2.4 compliant module that supports the CASv1 and CASv2 protocols
 
 Group:          System Environment/Daemons
@@ -25,6 +25,7 @@ BuildRequires:  httpd-devel
 BuildRequires:  m4, readline-devel, autoconf, automake
 BuildRequires:  libcurl-devel
 BuildRequires:  libtool
+BuildRequires:  pcre-devel
 
 Requires:       httpd
 Requires:       mod_ssl
@@ -44,17 +45,19 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} LIBEXECDIR=%{_httpd_moddir}
+echo "DEBUG: _httpd_modconfdir: %{_httpd_modconfdir}"
+echo "DEBUG: _httpd_confdir: %{_httpd_modconfdir}"
 %if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
 # httpd <= 2.2.x
-install -Dp -m 644 %{SOURCE1} %{buildroot}%{_httpd_modconfdir}/auth_cas.conf
-install -Dp -m 644 %{SOURCE2} %{buildroot}%{_httpd_confdir}/auth_cas.conf
+cat %{SOURCE1} %{SOURCE2} > auth_cas.conf
+install -Dp -m 644 auth_cas.conf %{buildroot}%{_httpd_modconfdir}/auth_cas.conf
 %else
 # httpd >= 2.4.x
 install -Dp -m 644 %{SOURCE1} %{buildroot}%{_httpd_modconfdir}/10-auth_cas.conf
 install -Dp -m 644 %{SOURCE2} %{buildroot}%{_httpd_confdir}/auth_cas.conf
+%endif
 
 mkdir -p %{buildroot}/var/cache/httpd/%{name}
-%endif
 
 %clean
 rm -rf %{buildroot}
@@ -64,11 +67,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README
 %{_libdir}/httpd/modules/*.so
-%dir /var/cache/httpd/%{name}
 %config(noreplace) %{_httpd_confdir}/*.conf
 %config(noreplace) %{_httpd_modconfdir}/*.conf
+%dir /var/cache/httpd/%{name}
 
 %changelog
+* Fri Sep 02 2016 Adam Miller <maxamillion@fedoraproject.org> - 1.1-2
+- Fix EPEL6 conditionals for 1.1 update
+
 * Thu Jun 16 2016 Adam Miller <maxamillion@fedoraproject.org> - 1.1-1
 - Update to latest stable upstream