[libpng/f15] Update to libpng 1.2.48

[Tom Lane]

commit b91caa15478f84739516a8c2ab0f3632ff349336
Author: Tom Lane <tgl at redhat.com>
Date:   Sun Mar 11 19:23:16 2012 -0400

    Update to libpng 1.2.48

 .gitignore                 |    2 +-
 libpng-cve-2011-3026.patch |   24 ------------------------
 libpng.spec                |   10 ++++++----
 sources                    |    2 +-
 4 files changed, 8 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 985ee42..8fd575e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libpng-1.2.46.tar.bz2
+/libpng-1.2.48.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index c1e446d..b8e3dca 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,8 +1,8 @@
 Summary: A library of functions for manipulating PNG image format files
 Name: libpng
 Epoch: 2
-Version: 1.2.46
-Release: 2%{?dist}
+Version: 1.2.48
+Release: 1%{?dist}
 License: zlib
 Group: System Environment/Libraries
 URL: http://www.libpng.org/pub/png/
@@ -13,7 +13,6 @@ Source: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
 
 Patch0: libpng-multilib.patch
 Patch1: libpng-pngconf.patch
-Patch2: libpng-cve-2011-3026.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel, pkgconfig
@@ -57,7 +56,6 @@ necessary for some boot packages.
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure
@@ -96,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.la
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Mar 11 2012 Tom Lane <tgl at redhat.com> 2:1.2.48-1
+- Update to libpng 1.2.48, for minor security issues (CVE-2011-3045)
+Resolves: #801667
+
 * Thu Feb 16 2012 Tom Lane <tgl at redhat.com> 2:1.2.46-2
 - Fix CVE-2011-3026
 Resolves: #791183
diff --git a/sources b/sources
index 8596699..c331260 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8b43dc78ef95b3949af7f961d76874b  libpng-1.2.46.tar.bz2
+7612af5660cd4b5e8c433ce53bea01a7  libpng-1.2.48.tar.bz2