Author: oden
Date: Fri Feb 9 16:25:07 2007
New Revision: 118485
Modified:
packages/cooker/apache-mod_nss/current/SPECS/apache-mod_nss.spec
Log:
- fix deps
Modified: packages/cooker/apache-mod_nss/current/SPECS/apache-mod_nss.spec
==============================================================================
--- packages/cooker/apache-mod_nss/current/SPECS/apache-mod_nss.spec
(original)
+++ packages/cooker/apache-mod_nss/current/SPECS/apache-mod_nss.spec Fri Feb
9 16:25:07 2007
@@ -1,9 +1,10 @@
+%define nss_version 3.11.4
%define nssdir %{_sysconfdir}/pki/nss/apache-mod_nss
Summary: Provides SSL support using the NSS crypto libraries
Name: apache-mod_nss
Version: 1.0.6
-Release: %mkrel 1
+Release: %mkrel 2
License: Apache License
Group: System/Servers
URL: http://directory.fedora.redhat.com/wiki/Mod_nss
@@ -13,18 +14,16 @@
Requires(postun): rpm-helper
Requires(pre): apache-conf >= 2.2.0
Requires(pre): apache >= 2.2.0
-# nss has to match system nss libs provided by mozilla-firefox (1.0.7)
-Requires: nss = 1:3.11
+Requires: nss = 2:%{nss_version}
Requires: ksh
Requires: openssl
Requires: apache-conf >= 2.2.0
Requires: apache >= 2.2.0
BuildRequires: apache-devel >= 2.2.0
BuildRequires: automake1.7
-BuildRequires: nspr-devel >= 2:1.0.7
-BuildRequires: nss-devel >= 2:1.0.7
+BuildRequires: libnspr-devel >= 2:4.6.5
+BuildRequires: libnss-devel >= 2:%{nss_version}
BuildRequires: pkgconfig
-BuildRequires: mozilla-firefox
BuildRequires: flex
Conflicts: apache-mod_ssl apache-mod_ssl+distcache
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -63,10 +62,10 @@
%configure2_5x \
--with-apr-config=$APR \
--with-apxs=%{_sbindir}/apxs \
- --with-nspr-inc=`pkg-config --cflags mozilla-nspr | sed 's/^\-I//'` \
- --with-nspr-lib=`pkg-config --libs-only-L mozilla-nspr | sed 's/^\-L//'` \
- --with-nss-inc=`pkg-config --cflags mozilla-nss | awk '{ print $1}' | sed
's/^\-I//'` \
- --with-nss-lib=`pkg-config --libs-only-L mozilla-nss | sed 's/^\-L//'` \
+ --with-nspr-inc=`pkg-config --cflags nspr | sed 's/^\-I//'` \
+ --with-nspr-lib=%{_libdir} \
+ --with-nss-inc=`pkg-config --cflags nss | awk '{ print $1}' | sed
's/^\-I//'` \
+ --with-nss-lib=%{_libdir}
%make
