X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dovecot.spec;h=bbad5369672189dc4a6df38d62948aefe08b57ee;hb=672ffb70e47f0e63388e577310582fee6155387d;hp=b56184b153b2126c19cc81616b2f4b00128bfeee;hpb=caaa7d68332047ca977819143e17e8f66860c1aa;p=packages%2Fdovecot.git

diff --git a/dovecot.spec b/dovecot.spec
index b56184b..bbad536 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_with	gssapi	# with GSSAPI support
 %bcond_without	ldap	# without LDAP auth
 %bcond_without	mysql	# without MySQL auth
 %bcond_without	pgsql	# without PostgreSQL auth
@@ -9,26 +10,26 @@
 Summary:	IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):	Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:		dovecot
-Version:	1.0.7
-Release:	2
-License:	LGPL v2.1 and MIT
+Version:	1.1.7
+Release:	1
+Epoch:		1
+License:	MIT (libraries), LGPL v2.1 (the rest)
 Group:		Networking/Daemons
-Source0:	http://dovecot.org/releases/1.0/%{name}-%{version}.tar.gz
-# Source0-md5:	4d0dbe1fe87fd0f69acd28d100fe72ab
+Source0:	http://dovecot.org/releases/1.1/%{name}-%{version}.tar.gz
+# Source0-md5:	ea83ea2000a5b2e1744c7c97eb5585d1
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-config.patch
-#Patch1:		%{name}-dspam-plugin.patch
 URL:		http://dovecot.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.0}
 BuildRequires:	gettext-devel
-#BuildRequires:	krb5-devel
+%{?with_gssapi:BuildRequires:	krb5-devel}
 BuildRequires:	libtool
 %{?with_mysql:BuildRequires:	mysql-devel}
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.3}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
@@ -44,8 +45,8 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	pam >= 0.79.0
 Provides:	group(dovecot)
-Provides:	user(dovecot)
 Provides:	imapdaemon
+Provides:	user(dovecot)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -111,17 +112,20 @@ Stan:
   plików może być problematyczna
 
 %package devel
-Summary:	Libraries and headers for Dovecot
+Summary:	Development package for dovecot plugins
+Summary(pl.UTF-8):	Pakiet programistyczny do tworzenia wtyczek dla dovecota
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+# doesn't require base
 
 %description devel
-This package contains development files for linking against %{name}.
+Development package for dovecot plugins.
+
+%description devel -l pl.UTF-8
+Pakiet programistyczny do tworzenia wtyczek dla dovecota.
 
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' dovecot-example.conf
 
@@ -133,13 +137,15 @@ touch config.rpath
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-static \
 	%{?debug:--enable-debug} \
+	--enable-header-install \
 	%{?with_ldap:--with-ldap} \
 	%{?with_mysql:--with-mysql} \
 	%{?with_pgsql:--with-pgsql} \
 	%{?with_sasl:--with-cyrus-sasl2} \
 	%{?with_sqlite:--with-sqlite} \
-	--with-gssapi \
+	%{?with_gssapi:--with-gssapi} \
 	--with-ssl=openssl \
 	--with-ssl-dir=/var/lib/openssl \
 	--sysconfdir=/etc/%{name}
@@ -149,7 +155,6 @@ touch config.rpath
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security}
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
 install -d $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login}
 
 %{__make} install \
@@ -164,21 +169,20 @@ install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins{,/imap}/*.la
+
 # devel
 for folder in deliver imap lib lib-imap lib-mail lib-storage; do
-    install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder
-    install -p -m644 src/$folder/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder/
+	install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder
+	install -p -m644 src/$folder/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/$folder/
 done
-
-for folder in lib lib-imap lib-mail lib-storage; do
-    install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/$folder
-    install -p -m644 src/$folder/*.a $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/$folder/
-done
-
-for f in dovecot-config config.h stamp.h; do
-    install -p -m644 $f $RPM_BUILD_ROOT%{_includedir}/%{name}
+for dir in lib lib-imap lib-mail lib-storage; do
+	install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
+	install -p -m644 src/$dir/*.a $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/src/$dir
 done
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dovecot-config $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
 
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -209,6 +213,10 @@ if [ "$1" = "0" ]; then
 	%groupremove dovecot
 fi
 
+%triggerpostun -- dovecot < 1:1.1
+echo "Configuration change default_mail_env -> mail_location"
+%{__sed} -i -e "s/^default_mail_env/mail_location/" /etc/dovecot/dovecot.conf
+
 %files
 %defattr(644,root,root,755)
 # COPYING contains some notes, not actual LGPL text
@@ -217,12 +225,13 @@ fi
 %attr(755,root,root) %{_sbindir}/%{name}pw
 %attr(750,root,root) %dir %{_sysconfdir}/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-ldap-example.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-sql-example.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/%{name}
 %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) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-#Files :P
-%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/checkpassword-reply
 %attr(755,root,root) %{_libdir}/%{name}/deliver
 %attr(755,root,root) %{_libdir}/%{name}/dict
@@ -231,12 +240,16 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/idxview
 %attr(755,root,root) %{_libdir}/%{name}/imap
 %attr(755,root,root) %{_libdir}/%{name}/imap-login
+%attr(755,root,root) %{_libdir}/%{name}/convert-tool
+%attr(755,root,root) %{_libdir}/%{name}/expire-tool
+%attr(755,root,root) %{_libdir}/%{name}/listview
 %attr(755,root,root) %{_libdir}/%{name}/logview
+%attr(755,root,root) %{_libdir}/%{name}/maildirlock
 %attr(755,root,root) %{_libdir}/%{name}/pop3
 %attr(755,root,root) %{_libdir}/%{name}/pop3-login
 %attr(755,root,root) %{_libdir}/%{name}/rawlog
 %attr(755,root,root) %{_libdir}/%{name}/ssl-build-param
-%dir %{_libdir}/%{name}/plugins/
+%dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %dir %{_libdir}/%{name}/plugins/imap
 %attr(755,root,root)%{_libdir}/%{name}/plugins/imap/*.so
@@ -250,16 +263,5 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/%{name}/plugins/*.a
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.la
-%{_libdir}/%{name}/plugins/imap/*.a
-%attr(755,root,root) %{_libdir}/%{name}/plugins/imap/*.la
-%dir %{_libdir}/%{name}/plugins/lib
-%{_libdir}/%{name}/plugins/lib/*.a
-%dir %{_libdir}/%{name}/plugins/lib-imap
-%{_libdir}/%{name}/plugins/lib-imap/*.a
-%dir %{_libdir}/%{name}/plugins/lib-mail
-%{_libdir}/%{name}/plugins/lib-mail/*.a
-%dir %{_libdir}/%{name}/plugins/lib-storage
-%{_libdir}/%{name}/plugins/lib-storage/*.a
+%{_libdir}/%{name}-devel
 %{_includedir}/%{name}