From 1e53430761a9cf6b92ae3dd732e4426252927c93 Mon Sep 17 00:00:00 2001
From: Honza Horák <hhorak@redhat.com>
Date: Mar 25 2013 14:53:17 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/gd


Conflicts:
	gd.spec

---

diff --git a/gd.spec b/gd.spec
index f3a8664..e9a633c 100644
--- a/gd.spec
+++ b/gd.spec
@@ -1,7 +1,7 @@
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
 Version:       2.0.35
-Release:       20%{?dist}
+Release:       23%{?dist}
 Group:         System Environment/Libraries
 License:       MIT
 URL:           http://www.libgd.org/Main_Page
@@ -117,9 +117,18 @@ popd
 %{_libdir}/pkgconfig/gdlib.pc
 
 %changelog
-* Mon Mar 25 2013 Honza Horak <hhorak@redhat.com> - 2.0.35-20
+* Mon Mar 25 2013 Honza Horak <hhorak@redhat.com> - 2.0.35-23
 - Fix issues found by Coverity
 
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.35-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 2.0.35-21
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.0.35-20
+- rebuild against new libjpeg
+
 * Tue Aug 28 2012 Honza Horak <hhorak@redhat.com> - 2.0.35-19
 - Spec file cleanup
 - Compile and run test suite during build