X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cyrus-imapd.spec;h=68832f79c9a45a7f5f99cabff4e7921ce42424c9;hb=e25dce16573b90e82ed690e5cf7ed66d26197bfe;hp=ac550f371af097c8e1ac2c28026890702749dbd1;hpb=797aec9376d23a1359e48b29c33e5f004a0911a2;p=packages%2Fcyrus-imapd.git

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index ac550f3..68832f7 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -4,7 +4,7 @@ Summary(pl):	Wysoko wydajny serwer IMAP i POP3
 Summary(pt_BR):	Um servidor de mail de alto desempenho que suporta IMAP e POP3
 Name:		cyrus-imapd
 Version:	2.0.16
-Release:	6
+Release:	9
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%{name}-%{version}.tar.gz
@@ -30,7 +30,6 @@ Patch7:		%{name}-db3.patch
 Patch8:		%{name}-ipv6.m4.patch
 Patch9:		%{name}-ac25x.patch
 URL:		http://andrew2.andrew.cmu.edu/cyrus/imapd/
-#Icon:		cyrus.gif
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	cyrus-sasl-devel >= 1.5.27
@@ -47,6 +46,9 @@ Requires(postun):	/usr/sbin/userdel
 Provides:	imapdaemon
 Provides:	pop3daemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Conflicts:	courier-imap
+Conflicts:	courier-imap-common
+Conflicts:	courier-imap-pop3
 Conflicts:	imap
 Conflicts:	imap-common
 Conflicts:	imap-pop2
@@ -54,7 +56,9 @@ Conflicts:	imap-pop3
 Conflicts:	qpopper
 Conflicts:	qpopper6
 Conflicts:	solid-pop3d
+Conflicts:	tpop3d
 Obsoletes:	imapd
+Obsoletes:	imap
 Obsoletes:	pop3daemon
 Obsoletes:	imapdaemon
 
@@ -102,6 +106,44 @@ arquivos que s
 usuários aos mails se dá através de software usando os protocolos
 IMAP, POP3 ou KPOP.
 
+%package devel
+Summary:	Libraries and include files for developing with cyrus-imapd
+Summary(pl):	Pliki potrzebne do programowania z u¿yciem cyrus-imapd
+Group:		Development/Libraries
+Requires:	%{name} = %{version}
+
+%description devel
+This package provides the necessary development libraries and include
+files to allow you to develop with cyrus-imapd.
+
+%description devel -l pl
+Ten pakiet zawiera biblioteki oraz pliki nag³ówkowe niezbêdne do
+tworzenia oprogramowania z wykorzystaniem cyrus-imapd.
+
+%package static
+Summary:	Static cyrus-imapd libraries
+Summary(pl):	Biblioteki statyczne cyrus-imapd
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}
+
+%description static
+Static cyrus-imapd libraries
+
+%description static -l pl
+Biblioteki statyczne cyrus-imapd
+
+%package -n perl-%{name}
+Summary:	Perl interface to cyrus-imapd library
+Summary(pl):	Perlowy interfejs do biblioteki cyrus-imapd
+Group:		Development/Languages/Perl
+Requires:	%{name} = %{version}
+
+%description -n perl-%{name}
+Perl interface to cyrus-imapd library.
+
+%description -n perl-%{name} -l pl
+Perlowy interfejs do biblioteki cyrus-imapd.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -118,15 +160,15 @@ IMAP, POP3 ou KPOP.
 %build
 cd makedepend
 rm -f aclocal.m4
-aclocal
+%{__aclocal}
 %{__autoconf}
 %configure
 %{__make}
 PATH=$PATH:`pwd`; export PATH
 cd ..
 rm -f aclocal.m4
-aclocal -I cmulocal
-autoheader
+%{__aclocal} -I cmulocal
+%{__autoheader}
 %{__autoconf}
 %configure \
 	--with-auth=unix \
@@ -168,6 +210,7 @@ mv -f $RPM_BUILD_ROOT%{_libexecdir}/bin/*	$RPM_BUILD_ROOT%{_libexecdir}
 mv -f $RPM_BUILD_ROOT%{_libexecdir}/master	$RPM_BUILD_ROOT%{_libexecdir}/cyrus-master
 mv -f $RPM_BUILD_ROOT%{_mandir}/man8/master.8	$RPM_BUILD_ROOT%{_mandir}/man8/cyrus-master.8
 rm -rf $RPM_BUILD_ROOT%{_libexecdir}/bin
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/idled.8
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{imap,pop}
 
@@ -179,10 +222,10 @@ cd $RPM_BUILD_ROOT/var
 perl <<EOF
 foreach \$i ("a".."z")
 {
-  mkdir "lib/imap/user/\$i", 0755;
-  mkdir "lib/imap/quota/\$i", 0755;
-  mkdir "lib/imap/sieve/\$i", 0755;
-  mkdir "spool/imap/\$i", 0755;
+	mkdir "lib/imap/user/\$i", 0755;
+	mkdir "lib/imap/quota/\$i", 0755;
+	mkdir "lib/imap/sieve/\$i", 0755;
+	mkdir "spool/imap/\$i", 0755;
 }
 EOF
 cd ${oldpwd}
@@ -250,9 +293,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/reconstruct
 %attr(755,root,root) %{_libexecdir}/timsieved
 
-%{perl_sitearch}/Cyrus
-%{perl_sitearch}/auto/Cyrus
-
 %attr(750,cyrus,mail) /var/spool/imap
 %attr(750,cyrus,mail) %dir /var/lib/imap
 %attr(750,cyrus,mail) %dir /var/lib/imap/deliverdb
@@ -268,5 +308,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(750,cyrus,mail) %config(noreplace) %verify(not size md5 mtime) /var/lib/imap/mailboxes
 
 %{_mandir}/man*/*
+
+%files devel
+%defattr(644,root,root,755)
 %{_includedir}/cyrus
+
+%files static
+%defattr(644,root,root,755)
 %{_libdir}/lib*.a
+
+%files -n perl-%{name}
+%defattr(644,root,root,755)
+%{perl_sitearch}/Cyrus
+%{perl_sitearch}/auto/Cyrus