X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alpine.spec;h=b4819c1d48f360ff2d73b3f0c66d791c4b12b314;hb=654c2d89bfb2f69e8a1e4e15b1761794c90dc79c;hp=8b82d5b7ba76657236ce89f2a5986eaaa546069a;hpb=5af630df89300151bf88419ad729c8678bf32206;p=packages%2Falpine.git

diff --git a/alpine.spec b/alpine.spec
index 8b82d5b..b4819c1 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -1,14 +1,14 @@
 # TODO:
-# - backport man-pages from pine.spec
-# - separate package with tcl web-frontend
-# - fix as-needed
+#- backport man-pages from pine.spec
+#- separate package with tcl web-frontend
+#- fix as-needed
 %define		ver		2.00
-%define		patchlevel	13
+%define		patchlevel	53
 Summary:	University of Washington Alpine mail user agent
 Summary(pl.UTF-8):	Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie
 Name:		alpine
 Version:	%{ver}.%{patchlevel}
-Release:	1
+Release:	3
 Epoch:		1
 License:	Apache v2.0
 Group:		Applications/Mail
@@ -16,7 +16,7 @@ Group:		Applications/Mail
 #Source0:	ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.gz
 # Source with applied patches from http://staff.washington.edu/chappa/alpine/
 Source0:	http://staff.washington.edu/chappa/alpine/patches/alpine-%{ver}/%{name}-%{ver}_%{patchlevel}.tar.gz
-# Source0-md5:	e78fb53acaa23a6fc09ab6d848edc72b
+# Source0-md5:	69b1f9cc9c4e06d31a44b0e6bf10283e
 Source1:	pico.desktop
 Source2:	%{name}.desktop
 Source3:	%{name}.png
@@ -32,14 +32,19 @@ URL:		http://www.washington.edu/alpine/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	home-etc-devel
-BuildRequires:	krb5-devel
+%if "%{pld_release}" != "ac"
+BuildRequires:	heimdal-devel
+%endif
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	openldap-devel >= 2.4.6
+BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pam-devel
 # Only for web-frontend:
 #BuildRequires:	tcl-devel
 Suggests:	aspell
+Suggests:	ca-certificates
+Conflicts:	ca-certificates < 20080809-4
 Provides:	pine = 6.00
 Obsoletes:	pine
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -135,7 +140,7 @@ rm -f libtool missing
 	--%{?debug:en}%{!?debug:dis}able-debug \
 	--enable-quotas \
 	--without-tcl \
-	--with-smtp-msa=%{_libdir}/sendmail \
+	--with-smtp-msa=/usr/lib/sendmail \
 	--with-simple-spellcheck=aspell \
 	--with-system-pinerc=%{_sysconfdir}/%{name}/%{name}.conf \
 	--with-system-fixed-pinerc=%{_sysconfdir}/%{name}/%{name}.conf.fixed \
@@ -143,8 +148,13 @@ rm -f libtool missing
 	--with-ldap-dir=%{_prefix} \
 	--with-system-mail-directory=/var/mail \
 	--with-c-client-target=slx \
+%if "%{pld_release}" == "ti"
 	--with-ssl-dir=/var/lib/openssl/certs \
 	--with-ssl-certs-dir=/var/lib/openssl/certs \
+%else
+	--with-ssl-dir=/etc/openssl/certs \
+	--with-ssl-certs-dir=/etc/certs \
+%endif
 	--with-passfile=.pine.pwd
 
 %{__make} \