[mod_auth_openid/el6] Remove default mod_auth_openid.conf

Patrick Uiterwijk puiterwijk at fedoraproject.org
Wed May 29 23:45:51 UTC 2013


commit f5706239526b5961e969314a24e2089fe2789a3c
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Thu May 30 01:45:35 2013 +0200

    Remove default mod_auth_openid.conf

 mod_auth_openid.conf |    1 -
 mod_auth_openid.spec |   13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/mod_auth_openid.spec b/mod_auth_openid.spec
index 1709020..f248e37 100644
--- a/mod_auth_openid.spec
+++ b/mod_auth_openid.spec
@@ -7,14 +7,13 @@
 
 Name:           mod_auth_openid
 Version:        0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OpenID authentication for apache
 
 License:        MIT
 URL:            http://findingscience.com/mod_auth_openid/
 Source0:        https://github.com/downloads/bmuller/mod_auth_openid/mod_auth_openid-0.7.tar.gz
-Source1:        mod_auth_openid.conf
-Source2:        10-mod_auth_openid.conf
+Source1:        10-mod_auth_openid.conf
 
 BuildRequires:  tidy-devel
 BuildRequires:  libopkele-devel
@@ -49,12 +48,11 @@ install -m 700 -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
 # 2.4-style
-install -Dp -m0644 %{SOURCE2} %{buildroot}%{_httpd_modconfdir}/10-mod_auth_openid.conf
-install -Dp -m0644 %{SOURCE1} %{buildroot}%{_httpd_confdir}/mod_auth_openid.conf
+install -Dp -m0644 %{SOURCE1} %{buildroot}%{_httpd_modconfdir}/10-mod_auth_openid.conf
 %else
 # 2.2-style
 install -d -m0755 %{buildroot}%{_httpd_confdir}
-cat %{SOURCE2} %{SOURCE1} > %{buildroot}%{_httpd_confdir}/mod_auth_openid.conf
+install -Dp -m644 %{SOURCE1} > %{buildroot}%{_httpd_confdir}/mod_auth_openid.conf
 %endif
 install -m 755 src/.libs/mod_auth_openid.so %{buildroot}%{_httpd_moddir}
 
@@ -72,6 +70,9 @@ install -m 755 src/.libs/mod_auth_openid.so %{buildroot}%{_httpd_moddir}
 
 
 %changelog
+* Wed May 29 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 0.7-3
+- Remove default mod_auth_openid.conf
+
 * Tue May 21 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 0.7-2
 - Remove explicit requires
 - Add needed buildrequire


More information about the scm-commits mailing list