[roundcubemail/f16: 10/10] Merge branch 'f17' into f16

[Jon Ciesla]

commit c85e1ec1a57120711f28f8991b88bcbb206b4ed3
Merge: 36ef000 abd268e
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jun 11 09:40:57 2012 -0500

    Merge branch 'f17' into f16
    
    Conflicts:
    	roundcubemail.spec

 .gitignore                                 |    4 +
 roundcubemail-0.1.1-mysql.update.sql.patch |   11 ---
 roundcubemail-0.1.1-pear.patch             |   11 ---
 roundcubemail-0.2-CVE-2009-0413.patch      |   24 -------
 roundcubemail-0.2-alpha-confpath.patch     |   18 -----
 roundcubemail-0.2-beta-CVE-2008-5620.patch |   60 ------------------
 roundcubemail-0.2-beta-confpath.patch      |   12 ----
 roundcubemail-0.2-beta-html2text.patch     |   94 ----------------------------
 roundcubemail-0.2-stable-pg-mdb2.patch     |    5 --
 roundcubemail-0.3.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.4.1-pg-mdb2.patch          |   11 ---
 roundcubemail-0.5.1-CVE-2010-0464.patch    |   17 -----
 roundcubemail-0.7.1-strict.patch           |   11 +++
 roundcubemail-0.7.2-strict.patch           |   11 +++
 roundcubemail.spec                         |   50 ++++++++++-----
 sources                                    |    2 +-
 16 files changed, 59 insertions(+), 299 deletions(-)
---
diff --cc roundcubemail.spec
index ba1d3ef,e47a63c..aea3bca
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@@ -151,12 -138,33 +138,39 @@@ exit 
  %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
  
  %changelog
+ * Mon Mar 12 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.2-2
+ - Rediffed strict patch.
+ 
+ * Mon Mar 12 2012 Adam Williamson <awilliam at redhat.com> - 0.7.2-1
+ - new upstream release 0.7.2
+ 
 +* Sat Mar 31 2012 Jon Ciesla <limburgher at gmail.com> - 0.5.4-4
 +- EVR bump to fix upgrade path from f15.
 +
 +* Fri Mar 02 2012 Jon Ciesla <limburgher at gmail.com> - 0.5.4-2
 +- Fix logrotate, BZ 753983.
 +
+ * Thu Feb 16 2012 Jon Ciesla <limburgher at gmail.com> - 0.7.1-2
+ - Fix logrotate, BZ 789552.
+ - Modify error logging for strict, BZ 789576.
+ 
+ * Wed Feb  1 2012 Adam Williamson <awilliam at redhat.com> - 0.7.1-1
+ - new upstream release
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Wed Dec 14 2011 Adam Williamson <awilliam at redhat.com> - 0.7-1
+ - new upstream release
+ - drop all patches except confpath.patch:
+ 	+ html2text.patch and all CVE fixes were merged upstream
+ 	+ pg-mdb2.patch no longer necessary as all currently supported
+ 	  Fedora releases have a php-pear-MDB2-Driver-pgsql package new
+ 	  enough to work with this option
+ 
+ * Fri Oct 07 2011 Jon Ciesla <limb at jcomserv.net> = 0.6-1
+ - New upstream.
+ 
  * Tue Sep 06 2011 Jon Ciesla <limb at jcomserv.net> = 0.5.4-1
  - New upstream, fixes multiple security issues.