[mod_nss] add dependency on httpd-mmn

jorton jorton at fedoraproject.org
Tue Jul 30 08:16:41 UTC 2013


commit e351dcb18329407f1d7c354683a85237384b766a
Author: Joe Orton <jorton at redhat.com>
Date:   Tue Jul 30 09:16:28 2013 +0100

    add dependency on httpd-mmn

 mod_nss.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/mod_nss.spec b/mod_nss.spec
index 0aa0aac..1656c0a 100644
--- a/mod_nss.spec
+++ b/mod_nss.spec
@@ -2,10 +2,11 @@
 %{!?_httpd_confdir:    %{expand: %%global _httpd_confdir    %%{_sysconfdir}/httpd/conf.d}}
 # /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
 %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
+%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo missing-httpd-devel)}}
 
 Name: mod_nss
 Version: 1.0.8
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: SSL/TLS module for the Apache HTTP server
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -15,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: nspr-devel >= 4.6.3, nss-devel >= 3.12.6
 BuildRequires: httpd-devel, apr-devel, apr-util-devel
 BuildRequires: pkgconfig
+Requires: httpd-mmn = %{_httpd_mmn}
 Requires(post): httpd, nss-tools
 Requires: nss%{?_isa} >= 3.12.6
 # Although the following change reverses the desire of Bugzilla Bug #601939, it
@@ -166,6 +168,9 @@ fi
 %{_sbindir}/gencert
 
 %changelog
+* Tue Jul 30 2013 Joe Orton <jorton at redhat.com> - 1.0.8-23
+- add dependency on httpd-mmn
+
 * Wed Jul  3 2013 Matthew Harmsen <mharmsen at redhat.com> - 1.0.8-22
 - Moved 'nss_pcache' from %%sbindir to %%libexecdir
   (provided compatibility link)


More information about the scm-commits mailing list