Author: glen                         Date: Tue Jun 17 05:05:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add apache config
- NOTE: not conflicting with mod_ssl due listening on 8443 port by default

---- Files affected:
SPECS:
   apache-mod_nss.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_nss.spec
diff -u SPECS/apache-mod_nss.spec:1.10 SPECS/apache-mod_nss.spec:1.11
--- SPECS/apache-mod_nss.spec:1.10      Tue Jun 17 05:50:12 2008
+++ SPECS/apache-mod_nss.spec   Tue Jun 17 07:05:10 2008
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
-# TODO
-# - apache config
+%define                mod_name        nss
 %define                apxs            /usr/sbin/apxs
 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.1
+Release:       0.2
 License:       Apache v2.0
 Group:         Networking/Daemons
 Source0:       
http://directory.fedoraproject.org/sources/mod_nss-%{version}.tar.gz
 # Source0-md5: 71107cbc702bf07c6c79843aa92a0e09
+Patch0:                %{name}-config.patch
 URL:           http://directory.fedoraproject.org/wiki/Mod_nss
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
@@ -24,7 +24,7 @@
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 
2>/dev/null)/conf.d
 
 %description
 An Apache 2.x module for implementing crypto using the Mozilla NSS
@@ -50,6 +50,7 @@
 
 %prep
 %setup -q -n mod_nss-%{version}
+%patch0 -p1
 
 %build
 # apr-util is missing in configure check
@@ -66,20 +67,19 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir}}
-
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir},%{_sysconfdir}}
 install .libs/libmodnss.so $RPM_BUILD_ROOT%{_pkglibdir}
 install nss_pcache $RPM_BUILD_ROOT%{_sbindir}
 
-# TODO: nss.conf -> %{_sysconfdir}/httpd.conf/XX_mod_nss.conf
-# (NOTE: at least default config conflicts with mod_ssl)
+cp -a nss.conf $RPM_BUILD_ROOT%{_sysconfdir}/40_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NOTICE README TODO docs/mod_nss.html nss.conf
+%doc NOTICE README TODO docs/mod_nss.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/libmodnss.so
 %attr(755,root,root) %{_sbindir}/nss_pcache
 
@@ -89,6 +89,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008/06/17 05:05:10  glen
+- add apache config
+- NOTE: not conflicting with mod_ssl due listening on 8443 port by default
+
 Revision 1.10  2008/06/17 03:50:12  glen
 - assume it will work with apache 2.x
 
================================================================

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

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

Reply via email to