- added info patch (adjust direntry to PLD standard)

- with modern libc separate libidn is not required
- release 2

diff --git a/msmtp-info.patch b/msmtp-info.patch
new file mode 100644 (file)
index 0000000..9c4f2bd
--- /dev/null
+++ b/msmtp-info.patch
@@ -0,0 +1,14 @@
+--- msmtp-1.8.20/doc/msmtp.texi.orig   2021-11-07 11:52:05.000000000 +0100
++++ msmtp-1.8.20/doc/msmtp.texi        2022-07-14 20:10:33.346875403 +0200
+@@ -26,9 +26,9 @@ notice are preserved. These files are of
+ @end quotation
+ @end copying
+ 
+-@dircategory Individual utilities
++@dircategory Net utilities:
+ @direntry
+-* msmtp: (msmtp).     An SMTP client.
++* msmtp: (msmtp).                     An SMTP client
+ @end direntry
+ 
+ @titlepage

diff --git a/msmtp.spec b/msmtp.spec
index f4a3644d738d383436659f8bb5860aaf310fe3ee..4ae5b9374562f0edc21603159a44fded3fa7d031 100644 (file)
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -2,23 +2,27 @@ Summary:      SMTP "plugin" for MUAs
 Summary(pl.UTF-8):     "Wtyczka" SMTP dla klientów pocztowych (MUA)
 Name:          msmtp
 Version:       1.8.20
-Release:       1
+Release:       2
 License:       GPL v3+
 Group:         Networking/Utilities
+#Source0Download: https://marlam.de/msmtp/download/
 Source0:       https://marlam.de/msmtp/releases/%{name}-%{version}.tar.xz
 # Source0-md5: 6fc0ce864d74992f6c6124c3611d15da
 Patch0:                %{name}-home_etc.patch
+Patch1:                %{name}-info.patch
 Source1:       %{name}rc
 URL:           https://marlam.de/msmtp/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11.1
 BuildRequires: gettext-tools
-BuildRequires: gnutls-devel >= 1.2.0
+# with AI_IDN support (or libidn2-devel)
+BuildRequires: glibc-devel >= 6:2.4
+BuildRequires: gnutls-devel >= 3.4
 BuildRequires: gsasl-devel
-BuildRequires: libidn-devel
 BuildRequires: libsecret-devel
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
+BuildRequires: texinfo
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,6 +76,7 @@ Dowiązania symboliczne msmtp do sendmaila.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gettextize}
@@ -114,13 +119,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README THANKS doc/msmtprc-{system,user}.example scripts
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/msmtp*
-%{_infodir}/msmtp*
+%doc AUTHORS ChangeLog NEWS README THANKS doc/msmtprc-{system,user}.example scripts
+%attr(755,root,root) %{_bindir}/msmtp
+%attr(755,root,root) %{_bindir}/msmtpd
+%{_mandir}/man1/msmtp.1*
+%{_mandir}/man1/msmtpd.1*
+%{_infodir}/msmtp.info*
 
 %files sendmail
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%attr(755,root,root) %{_sbindir}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/msmtprc
+%attr(755,root,root) %{_sbindir}/sendmail
 /usr/lib/sendmail