X-Git-Url: http://git.pld-linux.org/?p=packages%2Falpine.git;a=blobdiff_plain;f=alpine.spec;h=4717c30ea95b1d511dc804f62f93407593829dd7;hp=a5db203289f798edc3052879377f8296a45b1628;hb=7a2507b7e4adc2ebd0fe190cb79d238fdc0d59ec;hpb=271a23684e3d2c280a0a7b3bf4596807a63e1172

diff --git a/alpine.spec b/alpine.spec
index a5db203..4717c30 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -2,21 +2,21 @@
 # - backport man-pages from pine.spec
 # - separate package with tcl web-frontend
 # - fix as-needed
-Summary:	University of Washington Pine mail user agent
-Summary(pl.UTF-8):	Klient pocztowy Pine z Uniwersytetu w Waszyngtonie
+Summary:	University of Washington Alpine mail user agent
+Summary(pl.UTF-8):	Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie
 Name:		alpine
-%define		ver		0.999999
+%define		ver		1.00
 %define		patchlevel	3
 Version:	%{ver}.%{patchlevel}
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache License 2.0
 Group:		Applications/Mail
 # Main site:
 #Source0:	ftp://ftp.cac.washington.edu/alpine/%{name}-%{version}.tar.gz
-# Source with applied patches from http://staff.washington.edu/chappa/alpine/ 
+# 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:	9c3f59d0b2418148c4cd94a8e35c561f
+# Source0-md5:	3937652526da1afe6310e05650ace80c
 Source1:	pico.desktop
 Source2:	%{name}.desktop
 Source3:	%{name}.png
@@ -43,7 +43,7 @@ BuildRequires:	pam-devel
 # Only for web-frontend:
 #BuildRequires:	tcl-devel
 Obsoletes:	pine
-Provides:	pine = 4.98
+Provides:	pine = 4.99
 Suggests:	aspell
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,10 +71,11 @@ wiele zaawansowanych możliwości, a liczba opcji konfiguracyjnych
 ciągle rośnie.
 
 %package -n pico
-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
+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 = 4.99
 
 %description -n pico
 Pico is a simple, display-oriented text editor based on the Alpine
@@ -85,7 +86,7 @@ characters are typed they are immediately inserted into the text.
 %description -n pico -l pl.UTF-8
 Pico jest prostym, zorientowanym na wyświetlanie edytorem bazującym na
 alpine. Tak jak w pine komendy są wyświetlane na dole ekranu oraz
-dostępna jest pomoc konteksowa. Wpisywane znaki są natychmiast
+dostępna jest pomoc kontekstowa. Wpisywane znaki są natychmiast
 włączane do tekstu.
 
 %description -n pico -l pt_BR.UTF-8
@@ -94,20 +95,21 @@ Assim como no Pine, comandos são mostrados na parte de baixo da tela,
 e ajuda de acordo com o contexto está disponível.
 
 %package -n pilot
-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
+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 = 4.99
 
 %description -n pilot
 Pilot is a simple, display-oriented file system browser based on the
-Alpine message system composer. As with Alpine, commands are displayed at
-the bottom of the screen, and context-sensitive help is provided.
+Alpine message system composer. As with Alpine, commands are displayed
+at the bottom of the screen, and context-sensitive help is provided.
 
 %description -n pilot -l pl.UTF-8
 Pilot jest prostą, zorientowaną na wyświetlanie przeglądarką plików w
-stylu compsera pine. Podobnie jak w alpine polecenia sa wyświetlane na
-dole ekranu oraz jest dostępna pomoc kontekstowa.
+stylu composera pine. Podobnie jak w alpine polecenia są wyświetlane
+na dole ekranu oraz jest dostępna pomoc kontekstowa.
 
 %description -n pilot -l pt_BR.UTF-8
 Pilot é um navegador de sistemas de arquivos baseado no Pine. Assim
@@ -180,6 +182,12 @@ cat <<EOF > $RPM_BUILD_ROOT%{alpineconfdir}/alpine.conf.fixed
 
 EOF
 
+%post
+if [ -f "%{alpineconfdir}/alpine.conf" -a -f "%{alpineconfdir}/alpine.conf.rpmnew" ]; then
+	mv %{alpineconfdir}/alpine.conf %{alpineconfdir}/alpine.conf.backup
+	alpine -P %{alpineconfdir}/alpine.conf.backup -conf > /etc/alpine/alpine.conf || exit 0
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT