X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=msmtp.spec;h=f8ace1d1cca77cfc4832616920697450d2b91682;hb=062db315a206e23710de72cc49449e35e3828b0b;hp=a0dc2dc2849fdb2d25728a8c32afc0c4d43dbdf0;hpb=0f8275272e9f52b99c03a346c1e13b8326e50693;p=packages%2Fmsmtp.git

diff --git a/msmtp.spec b/msmtp.spec
index a0dc2dc..f8ace1d 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,17 +1,19 @@
 Summary:	SMTP "plugin" for MUAs
 Summary(pl):	"Wtyczka" SMTP dla klientów pocztowych (MUA)
 Name:		msmtp
-Version:	1.4.4
-Release:	1
-License:	GPL
+Version:	1.4.7
+Release:	2	
+License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/msmtp/%{name}-%{version}.tar.bz2
-# Source0-md5:	34b31619a61462d9f2dd4f59720cf05e
+# Source0-md5:	9c87a1f40e05dae4896622b56ec71b56
 Patch0:		%{name}-home_etc.patch
+Source1:	%{name}rc
 URL:		http://msmtp.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	gnutls-devel >= 1.2.0
+BuildRequires:	gsasl-devel
 BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -20,8 +22,9 @@ msmtp is a simple program that works as an "SMTP plugin" for Mutt and
 probably other MUAs (mail user agents). It forwards mails to an SMTP
 server (for example at a free mail provider) which does the delivery.
 Features include:
-- SMTP AUTH methods PLAIN, LOGIN and CRAM-MD5
+- PLAIN, LOGIN, CRAM-MD5, GSSAPI, DIGEST-MD5 and NTLM authentications
 - TLS encrypted connections
+- Internationalized Domain Names (IDN) support
 - IPv6 support
 - robustness
 - detailed error messages if something goes wrong (including the full
@@ -36,7 +39,8 @@ msmtp to prosty program dzia
 innych klientów pocztowych (MUA - mail user agents).
 Przekierowuje wiadomo¶ci do serwera SMTP (na przyk³ad providera
 darmowych kont e-mail), który je dostarcza. Mo¿liwo¶ci obejmuj±:
-- obs³ugê SMTP AUTH - metod PLAIN, LOGIN i CRAM-MD5
+- uwierzytelnianie PLAIN, LOGIN, CRAM-MD5, GSSAPI, DIGEST-MD5 i NTLM
+- obs³ugê Internationalized Domain Names (IDN)
 - szyfrowane po³±czenia TLS
 - obs³ugê IPv6
 - szczegó³owe komunikaty b³êdów w przypadku niepowodzenia (w³±cznie z
@@ -49,6 +53,23 @@ Wystarczy przekaza
 konfiguracyjnym) lub zrobienie dowi±zania symbolicznego do
 /usr/sbin/sendmail.
 
+%package sendmail
+Summary:	msmtp - sendmail symlinks
+Summary(pl):	msmtp - dowi±zania symboliczne do sendmail'a
+Group:		Networking/Daemons
+# Should be replaced with sth like P/O sendmail-wrapper
+Provides:	smtpdaemon
+Obsoletes:	smtpdaemon
+# Provides: sendmail-wrapper
+# Obsoletes: sendmail-wrapper
+Requires:	%{name} = %{version}-%{release}
+
+%description sendmail
+msmtp sendmail symlinks.
+
+%description -l pl sendmail
+Dowi±zania symboliczne msmtp do sendmaila.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -58,24 +79,24 @@ konfiguracyjnym) lub zrobienie dowi
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-# could use gnutls instead (but is not ready for current libgcrypt)
-# disable gsasl for now (see README.gsasl)
-%configure \
-	--with-ssl=openssl \
-	--disable-gsasl
+%configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_prefix}/lib,%{_sysconfdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/msmtprc
+ln -s %{_bindir}/%{name} $RPM_BUILD_ROOT/usr/lib/sendmail
+ln -s %{_bindir}/%{name} $RPM_BUILD_ROOT%{_sbindir}/sendmail
 
 %find_lang %{name}
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,3 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/msmtp*
 %{_infodir}/msmtp*
+
+%files sendmail
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%attr(755,root,root) %{_sbindir}/*
+/usr/lib/sendmail