[gutenprint/f17: 2/2] Merge branch 'f16' into f17

[Jiří Popelka]

commit c7e4844f58e7defb1e12cad971e78253f013d281
Merge: 4b65dbf 093242f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 9 15:01:08 2012 +0200

    Merge branch 'f16' into f17

 .gitignore                    |    1 +
 gutenprint-5.2.8-soname.patch |  225 -----------------------------------------
 gutenprint.spec               |   29 +++--
 sources                       |    2 +-
 4 files changed, 19 insertions(+), 238 deletions(-)
---
diff --cc gutenprint.spec
index 65bd013,27722c0..bc4aee4
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -308,6 -301,6 +301,18 @@@ f
  * Tue Jun 12 2012 Jiri Popelka <jpopelka at redhat.com> 5.2.8-1
  - 5.2.8
  
++* Tue Apr 03 2012 Nils Philippsen <nils at redhat.com> - 5.2.7-11
++- rebuild against gimp 2.8.0 release candidate
++
++* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.7-10
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
++
++* Fri Dec 16 2011 Nils Philippsen <nils at redhat.com> - 5.2.7-9
++- rebuild for GIMP 2.7
++
++* Mon Nov  7 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-8
++- Rebuild for new libpng.
++
  * Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-7
  - Added IEEE 1284 Device ID for Canon PIXMA MP250 (bug #744087).