Author: qboosh                       Date: Mon Jul 21 20:56:52 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.0.8
- disabled interactive part of build (no-go)

---- Files affected:
SPECS:
   apache-mod_nss.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_nss.spec
diff -u SPECS/apache-mod_nss.spec:1.14 SPECS/apache-mod_nss.spec:1.15
--- SPECS/apache-mod_nss.spec:1.14      Tue Jun 17 08:39:42 2008
+++ SPECS/apache-mod_nss.spec   Mon Jul 21 22:56:47 2008
@@ -6,12 +6,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
@@ -22,8 +22,8 @@
 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
@@ -74,11 +74,10 @@
 %{__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
@@ -87,7 +86,7 @@
 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
@@ -104,9 +103,9 @@
 %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
@@ -117,6 +116,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2008/07/21 20:56:47  qboosh
+- updated to 1.0.8
+- disabled interactive part of build (no-go)
+
 Revision 1.14  2008/06/17 06:39:42  glen
 - deps for tool usage
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_nss.spec?r1=1.14&r2=1.15&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to