X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alpine.spec;h=b0c7e0afe6b632038d5d7588222b2bdb866d81ad;hb=67522789f6e9a162aa158e27a2a9b62a8bcc1a08;hp=d416f94fbdced8477ce8bf7aa21cb640bd522cbd;hpb=7fbe3f5348b5cd0d479c8dfc602d4eea0e57283d;p=packages%2Falpine.git diff --git a/alpine.spec b/alpine.spec index d416f94..b0c7e0a 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 +%define ver 1.00 +%define patchlevel 12 +Summary: University of Washington Alpine mail user agent +Summary(pl.UTF-8): Klient pocztowy Alpine z Uniwersytetu w Waszyngtonie Name: alpine -%define ver 0.99999 -%define patchlevel 4 Version: %{ver}.%{patchlevel} -Release: 1 +Release: 2 Epoch: 1 -License: Apache License 2.0 +License: Apache v2.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: 055a67734af8190a709949f40211c3ed +# Source0-md5: eccde18b953df022d5e073b7de6b9c1a Source1: pico.desktop Source2: %{name}.desktop Source3: %{name}.png @@ -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 @@ -42,11 +41,12 @@ BuildRequires: openssl-devel BuildRequires: pam-devel # Only for web-frontend: #BuildRequires: tcl-devel +Suggests: aspell +Provides: pine = 5.00 Obsoletes: pine -Provides: pine = 4.98 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define alpineconfdir /etc/%{name} +%define alpineconfdir %{_sysconfdir}/%{name} %define filterout_ld -Wl,--as-needed %description @@ -70,10 +70,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 = 5.00 %description -n pico Pico is a simple, display-oriented text editor based on the Alpine @@ -84,7 +85,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 @@ -93,20 +94,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 = 5.00 %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 @@ -125,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 @@ -138,12 +139,15 @@ rm -f libtool missing --enable-quotas \ --without-tcl \ --with-smtp-msa=%{_libdir}/sendmail \ - --with-spellcheck-prog=aspell \ - --with-system-pinerc=%{alpineconfdir}/%{name}.conf \ - --with-system-fixed-pinerc=%{alpineconfdir}/%{name}.conf.fixed \ + --with-simple-spellcheck=aspell \ + --with-system-pinerc=%{_sysconfdir}/%{name}/%{name}.conf \ + --with-system-fixed-pinerc=%{_sysconfdir}/%{name}/%{name}.conf.fixed \ --with-krb5-dir=%{_prefix} \ --with-ldap-dir=%{_prefix} \ --with-system-mail-directory=/var/mail \ + --with-c-client-target=slx \ + --with-ssl-dir=/var/lib/openssl/certs \ + --with-ssl-certs-dir=/var/lib/openssl/certs \ --with-passfile=.pine.pwd %{__make} \ @@ -151,7 +155,7 @@ rm -f libtool missing %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{alpineconfdir},%{_desktopdir},%{_pixmapsdir}} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_desktopdir},%{_pixmapsdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -162,29 +166,35 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir} ln -s alpine $RPM_BUILD_ROOT%{_bindir}/pine -$RPM_BUILD_ROOT%{_bindir}/alpine -conf > $RPM_BUILD_ROOT%{alpineconfdir}/alpine.conf -cat < $RPM_BUILD_ROOT%{alpineconfdir}/alpine.conf.fixed +$RPM_BUILD_ROOT%{_bindir}/alpine -conf > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/alpine.conf.fixed # # Alpine system-wide enforced configuration file - customize as needed # # This file holds the system-wide enforced values for alpine configuration # settings. Any values set in it will override values set in the -# system-wide default configuration file (%{alpineconfdir}/alpine.conf) and +# system-wide default configuration file (%{_sysconfdir}/%{name}/alpine.conf) and # the user's own configuration file (~/.pinerc). # For more information on the format of this file, read the -# comments at the top of %{alpineconfdir}/alpine.conf +# comments at the top of %{_sysconfdir}/%{name}/alpine.conf 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 %files %defattr(644,root,root,755) %doc README doc/tech-notes.txt -%dir %{alpineconfdir} -%config(noreplace) %verify(not md5 mtime size) %{alpineconfdir}/alpine.conf -%config(noreplace) %verify(not md5 mtime size) %{alpineconfdir}/alpine.conf.fixed +%dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/alpine.conf.fixed %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/pine %attr(755,root,root) %{_bindir}/rpload