- updated to 1.0.8

- disabled interactive part of build (no-go)

Changed files:
    apache-mod_nss.spec -> 1.15

diff --git a/apache-mod_nss.spec b/apache-mod_nss.spec
index a310c0ed918c23b06cf78946e70ceccbbadab0be..46e37a794abf83dc285e4a957745c1d264d6c985 100644 (file)
--- a/apache-mod_nss.spec
+++ b/apache-mod_nss.spec
@@ -5,12 +5,12 @@
 Summary:       mod_nss - strong cryptography support for Apache using SSL/TLS library NSS
 Summary(pl.UTF-8):     mod_nss - silna kryptografia dla Apache'a przy użyciu biblioteki SSL/TLS NSS
 Name:          apache-mod_nss
-Version:       1.0.7
-Release:       0.4
+Version:       1.0.8
+Release:       0.1
 License:       Apache v2.0
 Group:         Networking/Daemons
 Source0:       http://directory.fedoraproject.org/sources/mod_nss-%{version}.tar.gz
-# Source0-md5: 71107cbc702bf07c6c79843aa92a0e09
+# Source0-md5: 32458d91ce909260a6081cce58004e2f
 Source1:       apache-server.crt
 Source2:       apache-server.key
 Patch0:                %{name}-config.patch
@@ -21,8 +21,8 @@ BuildRequires:        apr-devel >= 1:1.0
 BuildRequires: apr-util-devel >= 1:1.0
 BuildRequires: nspr-devel >= 1:4.6.2
 BuildRequires: nss-devel >= 1:3.11.3
-BuildRequires: nss-tools
-BuildRequires: openssl-tools
+#BuildRequires:        nss-tools
+#BuildRequires:        openssl-tools
 Requires:      apache(modules-api) = %{apache_modules_api}
 Requires:      nspr >= 1:4.6.2
 Requires:      nss >= 1:3.11.3
@@ -73,11 +73,10 @@ CPPFLAGS="`apu-1-config --includes`"
 %{__make}
 
 install -d nss
-# XXX: this is interactive
-certutil -N -d nss
-
-openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12 -name "Server-Cert" -passout pass:
-pk12util -i server.p12 -d nss -W ''
+# XXX: this is interactive, cannot be done in rpm build process
+#certutil -N -d nss
+#openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12 -name "Server-Cert" -passout pass:
+#pk12util -i server.p12 -d nss -W ''
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,7 +85,7 @@ install .libs/libmodnss.so $RPM_BUILD_ROOT%{_pkglibdir}
 install nss_pcache $RPM_BUILD_ROOT%{_sbindir}
 
 cp -a nss.conf $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/40_mod_%{mod_name}.conf
-cp -a nss/* $RPM_BUILD_ROOT%{_sysconfdir}/nss
+#cp -a nss/* $RPM_BUILD_ROOT%{_sysconfdir}/nss
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,9 +102,9 @@ fi
 %defattr(644,root,root,755)
 %doc NOTICE README TODO docs/mod_nss.html migrate.pl
 %attr(750,root,root) %dir %{_sysconfdir}/nss
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/cert8.db
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/key3.db
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/secmod.db
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/cert8.db
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/key3.db
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nss/secmod.db
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/libmodnss.so
 %attr(755,root,root) %{_sbindir}/nss_pcache