SPECS: imap.spec - up to 2007d

arekm arekm at pld-linux.org
Sun Nov 2 21:05:06 CET 2008


Author: arekm                        Date: Sun Nov  2 20:05:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2007d

---- Files affected:
SPECS:
   imap.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: SPECS/imap.spec
diff -u SPECS/imap.spec:1.113 SPECS/imap.spec:1.114
--- SPECS/imap.spec:1.113	Sun Oct 26 11:57:20 2008
+++ SPECS/imap.spec	Sun Nov  2 21:05:01 2008
@@ -7,13 +7,13 @@
 Summary(uk.UTF-8):	Забезпечує підтримку мережевого поштового протоколу IMAP
 Summary(zh_CN.UTF-8):	IMAP和POP服务器
 Name:		imap
-Version:	2007a1
+Version:	2007d
 Release:	1
 Epoch:		1
 License:	Apache v2.0
 Group:		Networking/Daemons
 Source0:	ftp://ftp.cac.washington.edu/mail/%{name}-%{version}.tar.Z
-# Source0-md5:	828a84c64ef933bfcc805b838576a774
+# Source0-md5:	80cdf8366a69417818f4d73181f16b9d
 Source1:	%{name}.pamd
 Source2:	%{name}-%{name}d.inetd
 Source3:	%{name}-pop2d.inetd
@@ -282,7 +282,7 @@
 POP/IMAP.
 
 %prep
-%setup -q -n %{name}-2007a
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -302,6 +302,8 @@
 	GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
 	LDOPT="%{rpmldflags}" \
 	SSLTYPE=unix \
+	SSLCERTS=/etc/openssl/certs \
+	SSLKEYS=/etc/openssl/private \
 	VERSION="%{version}"
 mv -f c-client/c-client.a libc-client.a
 
@@ -311,6 +313,8 @@
 	GCCOPTLEVEL="%{rpmcflags} -pipe -fPIC" \
 	LDOPT="%{rpmldflags}" \
 	SSLTYPE=unix \
+        SSLCERTS=/etc/openssl/certs \
+        SSLKEYS=/etc/openssl/private \
 	VERSION="%{version}"
 
 %install
@@ -318,7 +322,7 @@
 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} \
-	$RPM_BUILD_ROOT%{_var}/lib/openssl/certs
+	$RPM_BUILD_ROOT/etc/openssl/certs
 
 install ./src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop2d.8
 install ./src/ipopd/ipopd.8 $RPM_BUILD_ROOT%{_mandir}/man8/ipop3d.8
@@ -350,8 +354,8 @@
 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
-install %{SOURCE8} $RPM_BUILD_ROOT%{_var}/lib/openssl/certs/imapd.pem
-install %{SOURCE8} $RPM_BUILD_ROOT%{_var}/lib/openssl/certs/ipop3d.pem
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/imapd.pem
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/openssl/certs/ipop3d.pem
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
@@ -396,7 +400,7 @@
 %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
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/openssl/certs/imapd.pem
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/openssl/certs/imapd.pem
 %attr(755,root,root) %{_sbindir}/imapd
 %{_mandir}/man8/imapd.8*
 
@@ -410,7 +414,7 @@
 %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
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/openssl/certs/ipop3d.pem
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/openssl/certs/ipop3d.pem
 %attr(755,root,root) %{_sbindir}/ipop3d
 %{_mandir}/man8/ipop3d.8*
 
@@ -420,7 +424,6 @@
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/pop
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.pop3
-%dir %{_var}/lib/openssl/certs
 
 %files lib
 %defattr(644,root,root,755)
@@ -446,6 +449,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2008/11/02 20:05:01  arekm
+- up to 2007d
+
 Revision 1.113  2008/10/26 10:57:20  gotar
 - Networking/Daemons/POP3 group for POP3 servers
 
================================================================

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



More information about the pld-cvs-commit mailing list