[msmtp] New upstream release, install helper scripts in docdir

Nikolay Vladimirov turki at fedoraproject.org
Sat Jan 28 11:45:09 UTC 2012


commit 89074badffe1db137946c916b782adeae0065315
Author: Nikolay Vladimirov <nikolay at vladimiroff.com>
Date:   Sat Jan 28 13:44:10 2012 +0200

    New upstream release, install helper scripts in docdir

 .gitignore |    1 +
 msmtp.spec |   30 +++++++++++++++++++-----------
 sources    |    2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d78456..d777092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 msmtp-1.4.19.tar.bz2
 /msmtp-1.4.23.tar.bz2
+/msmtp-1.4.27.tar.bz2
diff --git a/msmtp.spec b/msmtp.spec
index 66cae7d..9980e8c 100644
--- a/msmtp.spec
+++ b/msmtp.spec
@@ -1,6 +1,6 @@
 Name:           msmtp
-Version:        1.4.23 
-Release:        2%{?dist}
+Version:        1.4.27 
+Release:        1%{?dist}
 Summary:        SMTP client
 Group:          System Environment/Base 
 License:        GPLv3+
@@ -40,10 +40,13 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+rm -f scripts/Makefile*
+mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cp -pr scripts %{buildroot}%{_defaultdocdir}/%{name}-%{version}/
 %find_lang %{name}
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -55,19 +58,24 @@ fi
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS
-%doc doc/msmtp.html doc/msmtp.pdf doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
-%{_bindir}/msmtp
-%{_infodir}/msmtp.info*
-%{_mandir}/man1/msmtp.1*
+%doc doc/msmtprc-system.example doc/msmtprc-user.example doc/Mutt+msmtp.txt
+%{_defaultdocdir}/%{name}-%{version}/scripts
+%{_bindir}/%{name}
+%{_infodir}/%{name}.info*
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Sat Jan 28 2012 Nikolay Vladimirov <nikolay at vladimiroff.com> - 1.4.27-1
+- New upstream release
+- install the helper scripts in package's docir
+- minor spec cleanup
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 0d70915..9eb6db3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fb7ae88186624cdb125d3efad3fdc16  msmtp-1.4.23.tar.bz2
+2d6d10d9c59ed2b2635554ed35fb9226  msmtp-1.4.27.tar.bz2


More information about the scm-commits mailing list