rpms/cyrus-imapd/F-10 cyrus-imapd.spec,1.49,1.50

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/cyrus-imapd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5959

Modified Files:
	cyrus-imapd.spec 
Log Message:
spec clean-up



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/F-10/cyrus-imapd.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- cyrus-imapd.spec	25 May 2009 16:01:04 -0000	1.49
+++ cyrus-imapd.spec	26 May 2009 08:54:42 -0000	1.50
@@ -224,7 +224,6 @@ autoheader
 autoconf -f
 
 %build
-#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration"
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 if pkg-config openssl; then
@@ -329,21 +328,15 @@ find doc -name "*.html.*" -type f | xarg
 %{__rm} -rf %{buildroot}
 
 # This hack is needed on RedHat > 7.3 to install the perl files correctly
-%if %{_perlhack}
 pushd perl/imap
   %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
 popd
 pushd perl/sieve/managesieve
   %{__perl} Makefile.PL PREFIX=%{buildroot}%{_prefix} INSTALLDIRS=vendor
 popd
-
 # Do what the regular make install does
-  %{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-  %{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
-%else
-  %{__make} install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
-  %{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} mandir=%{_mandir}
-%endif
+%{__make} install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
+%{__make} -C man install DESTDIR=%{buildroot} PREFIX=%{_prefix} mandir=%{_mandir}
 
 %if %{DEL_WRAP}
 %{__install} -m 2755 deliver-wrapper    %{buildroot}%{_cyrexecdir}/
@@ -418,13 +411,6 @@ mv %{buildroot}%{_mandir}/man8/pop3d.8 %
 
 # create the ghost pem file
 touch %{buildroot}%{ssl_pem_file}
-#TODO: check if this is still required
-# change config file so ssl certificates are under /etc rather than /usr/share
-%{__perl} -pi -e \
-'s@/usr/share/ssl/certs/%{name}.pem@%{ssl_pem_file}@g; \
- s@/usr/share/ssl/certs/ca-bundle.crt@/etc/pki/tls/certs/ca-bundle.crt@' \
- %{buildroot}%{_sysconfdir}/imapd.conf
-
 
 # Rename 'master' binary and manpage to avoid clash with postfix
 %{__mv} -f %{buildroot}%{_cyrexecdir}/master         %{buildroot}%{_cyrexecdir}/cyrus-master
@@ -466,9 +452,6 @@ find %{buildroot} -name ".packlist" -exe
 %{__rm} -f %{buildroot}%{_mandir}/man8/syncnews.8*
 %{__rm} -f doc/man/syncnews.8.html
 
-# On RedHat 7.3, this file is created here
-%{__rm} -f /perllocal.pod
-
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -494,11 +477,6 @@ do
   fi
 done
 
-# "ctl_deliver -E" is deprecated, now is "cyr_expire -E"
-if grep -q "ctl_deliver *-E" %{_sysconfdir}/cyrus.conf ; then
-  %{__perl} -pi -e "s/ctl_deliver *-E/cyr_expire -E/" %{_sysconfdir}/cyrus.conf
-fi
-
 # prevent idled related errors to show up
 %if %{IDLED}
   if grep -q "^#  idled" %{_sysconfdir}/cyrus.conf ; then
@@ -510,20 +488,8 @@ fi
   fi
 %endif
 
-#TODO:check if this is still required
-# change existing config so ssl certificates are under /etc rather than /usr/share
-%{__perl} -pi -e \
-'s@/usr/share/ssl/certs/%{name}.pem@%{ssl_pem_file}@g; \
- s@/usr/share/ssl/certs/ca-bundle.crt@/etc/pki/tls/certs/ca-bundle.crt@' \
- %{_sysconfdir}/imapd.conf
-
 # Create SSL certificates
 exec > /dev/null 2> /dev/null
-#TODO: is this still required?
-# if the certificate is only in the old location, move it to the new location
-if [ -f %{_datadir}/ssl/certs/%{name}.pem -a ! -f %{ssl_pem_file} ]; then
-mv %{_datadir}/ssl/certs/%{name}.pem %{ssl_pem_file}
-fi
 
 if [ ! -f %{ssl_pem_file} ]; then
 pushd %{_sysconfdir}/pki/tls/certs
@@ -615,7 +581,7 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/cyrus.conf
 %config(noreplace) %{_sysconfdir}/imapd.conf
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
@@ -630,69 +596,69 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/nntp
 %attr(0755,root,root) %{_sysconfdir}/cron.daily/%{name}
 %dir %{_cyrexecdir}
-%attr(0755,root,root) %{_cyrexecdir}/arbitron
-%attr(0755,root,root) %{_cyrexecdir}/arbitronsort.pl
-%attr(0755,root,root) %{_cyrexecdir}/chk_cyrus
-%attr(0755,root,root) %{_cyrexecdir}/convert-sieve.pl
-%attr(0755,root,root) %{_cyrexecdir}/ctl_cyrusdb
-%attr(0755,root,root) %{_cyrexecdir}/ctl_deliver
-%attr(0755,root,root) %{_cyrexecdir}/ctl_mboxlist
-%attr(0755,root,root) %{_cyrexecdir}/cvt_cyrusdb
-%attr(0755,root,root) %{_cyrexecdir}/cyr_dbtool
-%attr(0755,root,root) %{_cyrexecdir}/cyr_expire
-%attr(0755,root,root) %{_cyrexecdir}/cyr_synclog
-%attr(0755,root,root) %{_cyrexecdir}/cyrdump
-%attr(0755,root,root) %{_cyrexecdir}/cyrus-master
-%attr(0755,root,root) %{_cyrexecdir}/deliver
-%attr(0755,root,root) %{_cyrexecdir}/dohash
-%attr(0755,root,root) %{_cyrexecdir}/fud
-%attr(0755,root,root) %{_cyrexecdir}/imapd
-%attr(0755,root,root) %{_cyrexecdir}/ipurge
-%attr(0755,root,root) %{_cyrexecdir}/lmtpd
-%attr(0755,root,root) %{_cyrexecdir}/lmtpproxyd
-%attr(0755,root,root) %{_cyrexecdir}/make_sha1
-%attr(0755,root,root) %{_cyrexecdir}/masssievec
-%attr(0755,root,root) %{_cyrexecdir}/mbexamine
-%attr(0755,root,root) %{_cyrexecdir}/mbpath
-%attr(0755,root,root) %{_cyrexecdir}/migrate-metadata
-%attr(0755,root,root) %{_cyrexecdir}/mkimap
-%attr(0755,root,root) %{_cyrexecdir}/mknewsgroups
-%attr(0755,root,root) %{_cyrexecdir}/notifyd
-%attr(0755,root,root) %{_cyrexecdir}/pop3d
-%attr(0755,root,root) %{_cyrexecdir}/quota
-%attr(0755,root,root) %{_cyrexecdir}/reconstruct
-%attr(0755,root,root) %{_cyrexecdir}/rehash
-%attr(0755,root,root) %{_cyrexecdir}/sievec
-%attr(0755,root,root) %{_cyrexecdir}/sieved
-%attr(0755,root,root) %{_cyrexecdir}/smmapd
-%attr(0755,root,root) %{_cyrexecdir}/squatter
-%attr(0755,root,root) %{_cyrexecdir}/timsieved
-%attr(0755,root,root) %{_cyrexecdir}/tls_prune
-%attr(0755,root,root) %{_cyrexecdir}/translatesieve
-%attr(0755,root,root) %{_cyrexecdir}/undohash
-%attr(0755,root,root) %{_cyrexecdir}/unexpunge
-%attr(0755,root,root) %{_cyrexecdir}/upgradesieve
-%attr(0755,root,root) %{_cyrexecdir}/cvt_cyrusdb_all
-%attr(0755,root,root) %{_cyrexecdir}/rpm_set_permissions
+%{_cyrexecdir}/arbitron
+%{_cyrexecdir}/arbitronsort.pl
+%{_cyrexecdir}/chk_cyrus
+%{_cyrexecdir}/convert-sieve.pl
+%{_cyrexecdir}/ctl_cyrusdb
+%{_cyrexecdir}/ctl_deliver
+%{_cyrexecdir}/ctl_mboxlist
+%{_cyrexecdir}/cvt_cyrusdb
+%{_cyrexecdir}/cyr_dbtool
+%{_cyrexecdir}/cyr_expire
+%{_cyrexecdir}/cyr_synclog
+%{_cyrexecdir}/cyrdump
+%{_cyrexecdir}/cyrus-master
+%{_cyrexecdir}/deliver
+%{_cyrexecdir}/dohash
+%{_cyrexecdir}/fud
+%{_cyrexecdir}/imapd
+%{_cyrexecdir}/ipurge
+%{_cyrexecdir}/lmtpd
+%{_cyrexecdir}/lmtpproxyd
+%{_cyrexecdir}/make_sha1
+%{_cyrexecdir}/masssievec
+%{_cyrexecdir}/mbexamine
+%{_cyrexecdir}/mbpath
+%{_cyrexecdir}/migrate-metadata
+%{_cyrexecdir}/mkimap
+%{_cyrexecdir}/mknewsgroups
+%{_cyrexecdir}/notifyd
+%{_cyrexecdir}/pop3d
+%{_cyrexecdir}/quota
+%{_cyrexecdir}/reconstruct
+%{_cyrexecdir}/rehash
+%{_cyrexecdir}/sievec
+%{_cyrexecdir}/sieved
+%{_cyrexecdir}/smmapd
+%{_cyrexecdir}/squatter
+%{_cyrexecdir}/timsieved
+%{_cyrexecdir}/tls_prune
+%{_cyrexecdir}/translatesieve
+%{_cyrexecdir}/undohash
+%{_cyrexecdir}/unexpunge
+%{_cyrexecdir}/upgradesieve
+%{_cyrexecdir}/cvt_cyrusdb_all
+%{_cyrexecdir}/rpm_set_permissions
 %if %{IDLED}
-%attr(0755,root,root) %{_cyrexecdir}/idled
+%{_cyrexecdir}/idled
 %endif
 %if %{AUTOCREATE}
-%attr(0755,root,root) %{_cyrexecdir}/compile_sieve
+%{_cyrexecdir}/compile_sieve
 %endif
-%attr(0755,root,root) %{_cyrexecdir}/mupdate
-%attr(0755,root,root) %{_cyrexecdir}/mupdate-loadgen.pl
-%attr(0755,root,root) %{_cyrexecdir}/proxyd
-%attr(0755,root,root) %{_cyrexecdir}/make_md5
-%attr(0755,root,root) %{_cyrexecdir}/sync_client
-%attr(0755,root,root) %{_cyrexecdir}/sync_reset
-%attr(0755,root,root) %{_cyrexecdir}/sync_server
-%attr(0755,root,root) %{_cyrexecdir}/cyrfetchnews
-%attr(0755,root,root) %{_cyrexecdir}/nntpd
+%{_cyrexecdir}/mupdate
+%{_cyrexecdir}/mupdate-loadgen.pl
+%{_cyrexecdir}/proxyd
+%{_cyrexecdir}/make_md5
+%{_cyrexecdir}/sync_client
+%{_cyrexecdir}/sync_reset
+%{_cyrexecdir}/sync_server
+%{_cyrexecdir}/cyrfetchnews
+%{_cyrexecdir}/nntpd
 %if %{_withldap}
-%attr(0755,root,root) %{_cyrexecdir}/ptdump
-%attr(0755,root,root) %{_cyrexecdir}/ptexpire
-%attr(0755,root,root) %{_cyrexecdir}/ptloader
+%{_cyrexecdir}/ptdump
+%{_cyrexecdir}/ptexpire
+%{_cyrexecdir}/ptloader
 %endif
 %if %{DEL_WRAP}
 %attr(2755,%{_cyrususer},%{_cyrusgroup}) %{_cyrexecdir}/deliver-wrapper
@@ -765,8 +731,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Mon May 25 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-1
+* Tue May 26 2009 Michal Hlavinka <mhlavink at redhat.com> - 2.3.14-1
 - updated to 2.3.14
+- spec clean-up
 
 * Mon Feb 02 2009 Michal Hlavinka <mhlavink at rehdat.com> - 2.3.13-3
 - fix directory ownership