[mod_pubcookie/f17] httpd-mmn requires added (#803073)

Gabriel L. Somlo somlo at fedoraproject.org
Mon Mar 19 18:23:01 UTC 2012


commit 12012f225305f7b4a2ac2d2f3a400abfbfbef69b
Author: Gabriel L. Somlo <somlo at hedwig.ini.cmu.edu>
Date:   Mon Mar 19 14:22:59 2012 -0400

    httpd-mmn requires added (#803073)

 mod_pubcookie.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mod_pubcookie.spec b/mod_pubcookie.spec
index d76b872..4f60887 100644
--- a/mod_pubcookie.spec
+++ b/mod_pubcookie.spec
@@ -1,6 +1,8 @@
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo missing-httpd-devel)}}
+
 Name: mod_pubcookie
 Version: 3.3.4a
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A solution for single sign-on authentication to websites
 License: ASL 2.0
 Group: System Environment/Daemons
@@ -17,6 +19,7 @@ Patch0: pubcookie-3.3.4a-installdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: httpd-devel openssl-devel openldap-devel krb5-devel systemd-units
 Requires: mod_ssl
+Requires: httpd-mmn = %{_httpd_mmn}
 
 %description
 A standalone login server and modules for common web server platforms like
@@ -106,14 +109,17 @@ fi
 %defattr(-,root,root,-)
 %doc doc/install-filter.html doc/install-login.html doc/krb5-getcred.html
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/pubcookie_login.conf
-/lib/systemd/system/keyserver.socket
-/lib/systemd/system/keyserver.service
+%{_unitdir}/keyserver.socket
+%{_unitdir}/keyserver.service
 %{_sbindir}/keyserver
 %{_mandir}/man8/keyserver.*
 %{_datadir}/pubcookie
 %{_localstatedir}/lib/pubcookie/starter.key
 
 %changelog
+* Mon Mar 19 2012 Gabriel Somlo <somlo at cmu.edu> 3.3.4a-7
+- httpd-mmn requires added (#803073)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.4a-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list