SPECS: imap.spec - proper paths to openss/{certs, private} for Titanium - re...

[hawk]

Author: hawk                         Date: Thu Dec 11 22:59:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper paths to openss/{certs,private} for Titanium
- release 2

---- Files affected:
SPECS:
   imap.spec (1.117 -> 1.118) 

---- Diffs:

================================================================
Index: SPECS/imap.spec
diff -u SPECS/imap.spec:1.117 SPECS/imap.spec:1.118
--- SPECS/imap.spec:1.117	Thu Nov 13 21:55:36 2008
+++ SPECS/imap.spec	Thu Dec 11 23:59:23 2008
@@ -8,7 +8,7 @@
 Summary(zh_CN.UTF-8):	IMAP和POP服务器
 Name:		imap
 Version:	2007d
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache v2.0
 Group:		Networking/Daemons
@@ -302,8 +302,13 @@
 	GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
 	LDOPT="%{rpmldflags}" \
 	SSLTYPE=unix \
+%if "%{pld_release}" == "ti"
+	SSLCERTS=/var/lib/openssl/certs \
+	SSLKEYS=/var/lib/openssl/private \
+%else
 	SSLCERTS=/etc/openssl/certs \
 	SSLKEYS=/etc/openssl/private \
+%endif
 	VERSION="%{version}"
 mv -f c-client/c-client.a libc-client.a
 
@@ -313,8 +318,13 @@
 	GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
 	LDOPT="%{rpmldflags}" \
 	SSLTYPE=unix \
+%if "%{pld_release}" == "ti"
+	SSLCERTS=/var/lib/openssl/certs \
+	SSLKEYS=/var/lib/openssl/private \
+%else
 	SSLCERTS=/etc/openssl/certs \
 	SSLKEYS=/etc/openssl/private \
+%endif
 	VERSION="%{version}"
 
 %install
@@ -322,7 +332,11 @@
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_includedir},%{_libdir}} \
 	$RPM_BUILD_ROOT%{_mandir}/man{1,8} \
+%if "%{pld_release}" == "ti"
+	$RPM_BUILD_ROOT%{_var}/lib/openssl/certs
+%else
 	$RPM_BUILD_ROOT/etc/openssl/certs
+%endif
 
 install ./src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop2d.8
 install ./src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop3d.8
@@ -354,8 +368,13 @@
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/imaps
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ipop3s
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/pop
+%if "%{pld_release}" == "ti"
+install %{SOURCE8} $RPM_BUILD_ROOT%{_var}/lib/openssl/certs/imapd.pem
+install %{SOURCE8} $RPM_BUILD_ROOT%{_var}/lib/openssl/certs/ipop3d.pem
+%else
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/imapd.pem
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/ipop3d.pem
+%endif
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
@@ -400,7 +419,11 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/imaps
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/imap
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.imap
+%if "%{pld_release}" == "ti"
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/openssl/certs/imapd.pem
+%else
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/openssl/certs/imapd.pem
+%endif
 %attr(755,root,root) %{_sbindir}/imapd
 %{_mandir}/man8/imapd.8*
 
@@ -414,7 +437,11 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ipop3d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ipop3s
+%if "%{pld_release}" == "ti"
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/openssl/certs/ipop3d.pem
+%else
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/openssl/certs/ipop3d.pem
+%endif
 %attr(755,root,root) %{_sbindir}/ipop3d
 %{_mandir}/man8/ipop3d.8*
 
@@ -449,6 +476,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2008/12/11 22:59:23  hawk
+- proper paths to openss/{certs,private} for Titanium
+- release 2
+
 Revision 1.117  2008/11/13 20:55:36  qboosh
 - CVE refs too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/imap.spec?r1=1.117&r2=1.118&f=u