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

diff --git a/alpine.spec b/alpine.spec
index b0c7e0a..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
-%define		ver		1.00
-%define		patchlevel	12
+#- backport man-pages from pine.spec
+#- separate package with tcl web-frontend
+#- fix as-needed
+%define		ver		2.00
+%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:	2
+Release:	3
 Epoch:		1
 License:	Apache v2.0
 Group:		Applications/Mail
@@ -16,33 +16,36 @@ 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:	eccde18b953df022d5e073b7de6b9c1a
+# Source0-md5:	69b1f9cc9c4e06d31a44b0e6bf10283e
 Source1:	pico.desktop
 Source2:	%{name}.desktop
 Source3:	%{name}.png
 Patch0:		%{name}-index_display.patch
 Patch1:		%{name}-doc.patch
 Patch2:		%{name}-filter.patch
-Patch3:		%{name}-quote.patch
-Patch4:		%{name}-fhs.patch
-Patch5:		%{name}-segfix.patch
-Patch6:		%{name}-libc-client.patch
-Patch7:		%{name}-ssl.patch
-Patch8:		%{name}-no_1777_warning.patch
-Patch9:		%{name}-home_etc.patch
+Patch3:		%{name}-fhs.patch
+Patch4:		%{name}-libc-client.patch
+Patch5:		%{name}-ssl.patch
+Patch6:		%{name}-no_1777_warning.patch
+Patch7:		%{name}-home_etc.patch
 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
-Provides:	pine = 5.00
+Suggests:	ca-certificates
+Conflicts:	ca-certificates < 20080809-4
+Provides:	pine = 6.00
 Obsoletes:	pine
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,7 +77,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.00
+Provides:	pico = 6.00
 
 %description -n pico
 Pico is a simple, display-oriented text editor based on the Alpine
@@ -98,7 +101,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.00
+Provides:	pilot = 6.00
 
 %description -n pilot
 Pilot is a simple, display-oriented file system browser based on the
@@ -125,8 +128,6 @@ ajuda de acordo com o contexto está disponível.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 rm -f libtool missing
@@ -136,9 +137,10 @@ rm -f libtool missing
 %{__autoheader}
 %{__automake}
 %configure \
+	--%{?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 \
@@ -146,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} \
@@ -180,12 +187,6 @@ cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf.fixed
 
 EOF
 
-%post
-if [ -f %{_sysconfdir}/%{name}/alpine.conf -a -f %{_sysconfdir}/%{name}/alpine.conf.rpmnew ]; then
-	cp -f %{_sysconfdir}/%{name}/alpine.conf{,.backup}
-	alpine -P %{_sysconfdir}/%{name}/alpine.conf.backup -conf > %{_sysconfdir}/%{name}/alpine.conf || :
-fi
-
 %clean
 rm -rf $RPM_BUILD_ROOT