- rel.3 - fixhome patch is not needed now; it provides pine-5.0

[packages/alpine.git] / alpine.spec

diff --git a/alpine.spec b/alpine.spec
index 268136f7b6bd1e0a4ac0b0766009e35a5a38608e..fd76977a05246682a5b838ab48011dc70f2d55dd 100644 (file)
--- a/alpine.spec
+++ b/alpine.spec
@@ -8,7 +8,7 @@ Name:           alpine
 %define                ver             1.00
 %define                patchlevel      3
 Version:       %{ver}.%{patchlevel}
-Release:       1
+Release:       3
 Epoch:         1
 License:       Apache License 2.0
 Group:         Applications/Mail
@@ -27,10 +27,9 @@ Patch3:              %{name}-quote.patch
 Patch4:                %{name}-fhs.patch
 Patch5:                %{name}-segfix.patch
 Patch6:                %{name}-libc-client.patch
-Patch7:                %{name}-fixhome.patch
-Patch8:                %{name}-ssl.patch
-Patch9:                %{name}-no_1777_warning.patch
-Patch10:       %{name}-home_etc.patch
+Patch7:                %{name}-ssl.patch
+Patch8:                %{name}-no_1777_warning.patch
+Patch9:                %{name}-home_etc.patch
 URL:           http://www.washington.edu/alpine/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -43,7 +42,7 @@ BuildRequires:        pam-devel
 # Only for web-frontend:
 #BuildRequires:        tcl-devel
 Obsoletes:     pine
-Provides:      pine = 4.99
+Provides:      pine = 5.00
 Suggests:      aspell
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,7 +74,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 = 4.99
+Provides:      pico = 5.00
 
 %description -n pico
 Pico is a simple, display-oriented text editor based on the Alpine
@@ -99,7 +98,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 = 4.99
+Provides:      pilot = 5.00
 
 %description -n pilot
 Pilot is a simple, display-oriented file system browser based on the
@@ -128,7 +127,6 @@ ajuda de acordo com o contexto está disponível.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %build
 rm -f libtool missing
@@ -182,6 +180,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