- fix in pl.po-update patch, release 4

[packages/fetchmail.git] / fetchmail.spec

diff --git a/fetchmail.spec b/fetchmail.spec
index 976aa69c4ded642916e84418b4f425573cd0ea3d..683da72835e2cfbb478d9d714e26ca2c1422fc68 100644 (file)
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+%bcond_without ssl     # build without SSL support
+%bcond_without ipv6    # build without IPv6 support
+#
 Summary:       Remote mail fetch daemon for POP2, POP3, APOP, IMAP
 Summary(da):   Alsidig POP/IMAP post-afhentnings dæmon
 Summary(de):   Dämon zum Laden entfernter Mail (POP2, POP3, APOP, IMAP)
@@ -8,26 +13,27 @@ Summary(pt): Busca mensagens de um servidor usando POP ou IMAP
 Summary(ru):   õÔÉÌÉÔÁ ÉÚ×ÌÅÞÅÎÉÑ ÐÏÞÔÙ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÙ ÐÏ ÐÒÏÔÏËÏÌÁÍ POP/IMAP
 Summary(tr):   POP2, POP3, APOP, IMAP protokolleri ile uzaktan mektup alma yazýlýmý
 Summary(uk):   õÔÉ̦ÔÁ ÏÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú ×¦ÄÄÁÌÅÎϧ ÍÁÛÉÎÉ ÐÏ ÐÒÏÔÏËÏÌÁÍ POP/IMAP
-Summary(zh_CN): ¹¦ÄÜÇ¿´óµÄ POP/IMAP µç×ÓÓʼþÊÕÈ¡ÊØ»¤½ø³Ì
+Summary(zh_CN):        ¹¦ÄÜÇ¿´óµÄ POP/IMAP µç×ÓÓʼþÊÕÈ¡ÊØ»¤½ø³Ì
 Name:          fetchmail
-Version:       6.2.3
-Release:       1
+Version:       6.2.5
+Release:       4
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://catb.org/~esr/fetchmail/%{name}-%{version}.tar.gz
-# Source0-md5: e131bdb6c3977fd47a3e122c43dcf19d
+# Source0-md5: 9956b30139edaa4f5f77c4d0dbd80225
 Source1:       %{name}conf.desktop
 Source2:       %{name}.sysconfig
 Source3:       %{name}.init
 Source4:       %{name}.logrotate
 Patch0:                %{name}-pl.po-update.patch
+Patch1:                %{name}-home_etc.patch
 Icon:          fetchmail.gif
-URL:           http://www.tuxedo.org/~esr/fetchmail/
+URL:           http://www.catb.org/~esr/fetchmail/
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
-%{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.7}
+%{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 Requires:      setup >= 2.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -118,7 +124,7 @@ Summary(uk):        
 Group:         Applications/System
 Requires:      %{name} = %{version}
 Requires:      python
-Requires:      tkinter
+Requires:      python-tkinter
 
 %description -n fetchmailconf
 A GUI configurator for generating fetchmail configuration file written
@@ -151,7 +157,7 @@ Summary(pl):        Skrypt startowy SysV do uruchamiania systemowego fetchmaila jako de
 Group:         Applications/System
 Requires:      %{name} = %{version}
 PreReq:                rc-scripts >= 0.2.0
-PreReq:                /sbin/chkconfig
+Requires(post,preun):  /sbin/chkconfig
 
 %description daemon
 SysV init script for demonize fetchmail for sucking emails.
@@ -162,18 +168,19 @@ Skrypt startowy SysV do uruchamiania systemowego fetchmaila jako demona.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.* .
 %configure \
        --enable-nls \
        --without-included-gettext \
-       --enable-inet6 \
+       %{?with_ipv6:--enable-inet6} \
        --enable-RPA \
        --enable-NTLM \
        --enable-SDPS \
-       %{!?_without_ssl:--with-ssl=%{_prefix}} \
-       %{?_without_ssl:--without-ssl} \
+       %{?with_ssl:--with-ssl=%{_prefix}} \
+       %{!?with_ssl:--without-ssl} \
        --without-kerberos
 %{__make}
 
@@ -219,7 +226,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc FEATURES README NEWS NOTES ABOUT-NLS INSTALL README.NTLM *.html FAQ
+%doc FEATURES README NEWS NOTES README.NTLM *.html FAQ
 %attr(755,root,root) %{_bindir}/fetchmail
 %{_mandir}/man1/fetchmail.1*