X-Git-Url: http://git.pld-linux.org/?p=packages%2Falpine.git;a=blobdiff_plain;f=alpine.spec;h=52784df9da1a955d7620d79efbdf9f172b0ce7e3;hp=b4248a283f60b83d6ef5eb74a6b3b2be2ba8f1cc;hb=02bc8e95ad07dfaea18d25bee8a5cc5eec4152f6;hpb=8e972a0ed12587a149dd7cb60a18e282b873dbd5

diff --git a/alpine.spec b/alpine.spec
index b4248a2..52784df 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -1,14 +1,10 @@
-# TODO:
-# - backport man-pages from pine.spec
-# - separate package with tcl web-frontend
-# - fix as-needed
-%define		ver		1.10
-%define		patchlevel	9
+%define		ver		2.00
+%define		patchlevel	37
 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:	2
+Release:	1
 Epoch:		1
 License:	Apache v2.0
 Group:		Applications/Mail
@@ -16,7 +12,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:	e3805be5b43c48c9cd5778309e37762e
+# Source0-md5:	716cb1ef22327f56c90df2bb7b47b3ca
 Source1:	pico.desktop
 Source2:	%{name}.desktop
 Source3:	%{name}.png
@@ -32,15 +28,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:	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
-Provides:	pine = 5.10
+Suggests:	ca-certificates
+Conflicts:	ca-certificates < 20080809-4
+Provides:	pine = 6.00
 Obsoletes:	pine
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,7 +72,7 @@ Summary:	Simple text editor in the style of the Pine Composer
 Summary(pl.UTF-8):	Prosty edytor tekstowy w stylu alpine
 Summary(pt_BR.UTF-8):	Editor de textos para terminal simples e fácil de usar
 Group:		Applications/Editors
-Provides:	pico = 5.10
+Provides:	pico = 6.00
 
 %description -n pico
 Pico is a simple, display-oriented text editor based on the Alpine
@@ -96,7 +96,7 @@ Summary:	Simple file system browser in the style of the Alpine Composer
 Summary(pl.UTF-8):	Prosta przeglądarka plików w stylu composera alpine
 Summary(pt_BR.UTF-8):	Navegador de sistemas de arquivos no estilo do compositor do Alpine
 Group:		Applications/Shells
-Provides:	pilot = 5.10
+Provides:	pilot = 6.00
 
 %description -n pilot
 Pilot is a simple, display-oriented file system browser based on the
@@ -132,6 +132,7 @@ rm -f libtool missing
 %{__autoheader}
 %{__automake}
 %configure \
+	--%{?debug:en}%{!?debug:dis}able-debug \
 	--enable-quotas \
 	--without-tcl \
 	--with-smtp-msa=%{_libdir}/sendmail \
@@ -142,8 +143,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} \