Release 4 (by relup.sh)

diff --git a/alpine-fhs.patch b/alpine-fhs.patch
index 5df544d2673de5ba3f35294705f89c9281a8138c..0ec6b3fe2ebd259435e2dc8401933a46d83644e0 100644 (file)
--- a/alpine-fhs.patch
+++ b/alpine-fhs.patch
@@ -9,7 +9,7 @@ diff -Nru pine4.30/imap/src/osdep/unix/Makefile pine4.30.new/imap/src/osdep/unix
 +       SPOOLDIR=/var/ \
         ACTIVEFILE=/var/lib/news/active \
         RSHPATH=/usr/bin/rsh \
-        BASECFLAGS="$(OPTIMIZE) -DNFSKLUDGE" \
+        BASECFLAGS="$(GCCCFLAGS)"
 @@ -556,7 +556,7 @@
        @echo If you want libc4 versions you must use sl4 instead!
        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -18,4 +18,4 @@ diff -Nru pine4.30/imap/src/osdep/unix/Makefile pine4.30.new/imap/src/osdep/unix
 +       SPOOLDIR=/var \
         ACTIVEFILE=/var/lib/news/active \
         RSHPATH=/usr/bin/rsh \
-        BASECFLAGS="$(OPTIMIZE) -DNFSKLUDGE" \
+        BASECFLAGS="$(GCCCFLAGS)" \

diff --git a/alpine.spec b/alpine.spec
index 70a4ead614c783911d3b67aacd17ec73ea9a4389..1e42fbd95078f16b71af054beaa02041e915c9d4 100644 (file)
--- a/alpine.spec
+++ b/alpine.spec
@@ -7,7 +7,7 @@ Summary:        University of Washington Alpine mail user agent
 Summary(pl.UTF-8):     Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie
 Name:          alpine
 Version:       2.11
-Release:       1
+Release:       4
 Epoch:         1
 License:       Apache v2.0
 Group:         Applications/Mail
@@ -33,21 +33,23 @@ URL:                http://www.washington.edu/alpine/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: home-etc-devel
-%if "%{pld_release}" != "ac"
-BuildRequires: heimdal-devel
-%endif
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel >= 1.0.1c
 BuildRequires: pam-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 # Only for web-frontend:
 #BuildRequires:        tcl-devel
+%if "%{pld_release}" != "ac"
+BuildRequires: heimdal-devel
+%endif
 Suggests:      aspell
 Suggests:      ca-certificates
-Conflicts:     ca-certificates < 20080809-4
 Provides:      pine = 6.00
 Obsoletes:     pine
+Conflicts:     ca-certificates < 20080809-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                alpineconfdir   %{_sysconfdir}/%{name}
@@ -93,9 +95,9 @@ dostępna jest pomoc kontekstowa. Wpisywane znaki są natychmiast
 włączane do tekstu.
 
 %description -n pico -l pt_BR.UTF-8
-Pico é um editor de texto baseado no compositor de mensagens do Alpine.
-Assim como no Pine, comandos são mostrados na parte de baixo da tela,
-e ajuda de acordo com o contexto está disponível.
+Pico é um editor de texto baseado no compositor de mensagens do
+Alpine. 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
@@ -171,9 +173,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_desktopdir},%{_pixmapsdir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 ln -s alpine $RPM_BUILD_ROOT%{_bindir}/pine