rpms/cyrus-imapd/devel cyrus-imapd.spec,1.33,1.34

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17227

Modified Files:
	cyrus-imapd.spec 
Log Message:
* Tue Dec 04 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-8
- move certificate creation from -utils postinst to main package
- rebuild with newer openssl and openldap



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cyrus-imapd.spec	15 Oct 2007 16:31:43 -0000	1.33
+++ cyrus-imapd.spec	5 Dec 2007 23:12:12 -0000	1.34
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.9
 Name: cyrus-imapd
 Version: 2.3.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -576,34 +576,6 @@
  %{_sysconfdir}/imapd.conf
 %endif
 
-%preun
-if [ $1 = 0 ]; then
-  /sbin/service %{name} stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del %{name}
-  %{__rm} -f %{_vardata}/socket/* 2> /dev/null
-  %{__rm} -f %{_vardata}/proc/* 2> /dev/null
-%if %{_withldap}
-  %{__rm} -f %{_vardata}/ptclient/ptsock 2> /dev/null
-%endif
-fi
-
-%postun
-if [ $1 != 0 ]; then
-  /sbin/service %{name} condrestart >/dev/null 2>&1 || :
-fi
-
-%pre utils
-# Create 'cyrus' user on target host
-%if %{SASLGROUP}
-/usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
-/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -G %{_saslgroup} -s /bin/bash -u %{uid} -r %{_cyrususer} 2> /dev/null || :
-%else
-/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
-  -s /bin/bash -u %{uid} -r %{_cyrususer} 2> /dev/null || :
-%endif
-
-%post utils
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
 %if %{use_etc_pki}
@@ -632,6 +604,34 @@
 popd
 fi
 
+%preun
+if [ $1 = 0 ]; then
+  /sbin/service %{name} stop >/dev/null 2>&1 || :
+  /sbin/chkconfig --del %{name}
+  %{__rm} -f %{_vardata}/socket/* 2> /dev/null
+  %{__rm} -f %{_vardata}/proc/* 2> /dev/null
+%if %{_withldap}
+  %{__rm} -f %{_vardata}/ptclient/ptsock 2> /dev/null
+%endif
+fi
+
+%postun
+if [ $1 != 0 ]; then
+  /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+fi
+
+%pre utils
+# Create 'cyrus' user on target host
+%if %{SASLGROUP}
+/usr/sbin/groupadd -g %{gid} -r %{_saslgroup} 2> /dev/null || :
+/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
+  -G %{_saslgroup} -s /bin/bash -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+%else
+/usr/sbin/useradd -c "Cyrus IMAP Server" -d %{_vardata} -g %{_cyrusgroup} \
+  -s /bin/bash -u %{uid} -r %{_cyrususer} 2> /dev/null || :
+%endif
+
+%post utils
 # Add service entries if necessary
 if ! %{__grep} -q ^lmtp %{_sysconfdir}/services; then
   echo -e 'lmtp\t\t24/tcp\t\t\t\t# LMTP Mail Delivery over TCP' >> %{_sysconfdir}/services
@@ -803,6 +803,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Dec 04 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-8
+- move certificate creation from -utils postinst to main package
+- rebuild with newer openssl and openldap
+
 * Sun Sep 23 2007 Tomas Janousek <tjanouse at redhat.com> - 2.3.9-7
 - updated the getgrouplist patch
 - fixed a few undeclared functions (and int to pointer conversions)