Merge branch 'master' into el6

.gitignore

@@ -3,3 +3,4 @@ alpine-2.00.tar.bz2
 /re-alpine-2.03.tar.bz2
 /alpine-2.10.clean.tar.lzma
 /alpine-2.11.tar.xz
+/alpine-2.20.tar.xz

README.fedora

@@ -2,11 +2,6 @@
 = mlock =
 If you get a notice "[Folder vulnerable - directory /var/mail must have 1777 protection]", you may want install the uw-imap-utils package to get setgid mlock (BZ #427561)
 
-
-= maildir support =
-I'd like to stay out of it...  just search "Mark Crispin maildir" for the gory details. No open license maildir patch exists for alpine. As a workaround, you can install a localhost IMAP server such as dovecot or courier to serve maildir folders, and connect to localhost from alpine via IMAP. 
-
-
 An example pinerc line:
 	mymaildir {localhost/ssl/novalidate-cert/user=myusername}[],
 

alpine.spec

@@ -2,8 +2,8 @@
 
 Summary: powerful, easy to use console email client
 Name: alpine
-Version: 2.11
-Release: 1%{?dist}
+Version: 2.20
+Release: 2%{?dist}
 
 License: ASL 2.0
 Group: Applications/Internet
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENSE doc/tech-notes.txt
+%doc README LICENSE
 %doc README.fedora
 %ghost %config(noreplace) %{_sysconfdir}/pine.conf
 %ghost %config(noreplace) %{_sysconfdir}/pine.conf.fixed
@@ -131,6 +131,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 09 2015 Rex Dieter <rdieter@fedoraproject.org> 2.20-2
+- use patched alpine sources (#1270331,#1270183)
+
+* Mon Jul 06 2015 Joshua Daniel Franklin <joshuadfranklin@yahoo.com> 2.20-1
+- Build from new upstream for 2.20, fixes rhbz#1092688 rhbz#1142890
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Wed Nov 06 2013 Rex Dieter <rdieter@fedoraproject.org> 2.11-1
 - alpine-2.11, drop old/unused patches
 

sources

@@ -1 +1 @@
-522b582855fed048d3dea2c5fe1e23a4  alpine-2.11.tar.xz
+2d63c923f7995890c0eecfc0c3d1c936  alpine-2.20.tar.xz