From a4a6b60c27b6ca6e4b19c8f8989050f5c8a52379 Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Sun, 4 Jul 2010 14:56:38 +0000
Subject: [PATCH] - Update to 1.4.3 - Fixes CVE-2010-1205 (BZ #608238) - Fixes
 CVE-2010-2249 (BZ #608644) - Use %global instead of %define - Fixed %defattr
 tag - Dropped unneeded patches

---
 .cvsignore          |  2 +-
 mingw32-libpng.spec | 46 +++++++++++++++++++++++----------------------
 sources             |  2 +-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0c15a9f..0a4a22c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpng-1.2.40.tar.bz2
+libpng-1.4.3.tar.bz2
diff --git a/mingw32-libpng.spec b/mingw32-libpng.spec
index 7572fac..da69a01 100644
--- a/mingw32-libpng.spec
+++ b/mingw32-libpng.spec
@@ -1,19 +1,17 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-libpng
-Version:        1.2.40
-Release:        2%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        MinGW Windows Libpng library
 
 License:        zlib
 URL:            http://www.libpng.org/pub/png/
 Source0:        ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
-Patch0:         libpng-multilib.patch
-Patch1:         libpng-pngconf.patch
 Patch2:         mingw32-libpng-fix-invalid-exports.patch
 
 Group:          Development/Libraries
@@ -34,8 +32,6 @@ MinGW Windows Libpng library.
 
 %prep
 %setup -q -n libpng-%{version}
-%patch0 -p1
-%patch1 -p1
 
 # The configure script tries to generate a prefix which is used for
 # symbol declarations. However, when this prefix is prefix is used
@@ -68,25 +64,31 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
-%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-%{_mingw32_bindir}/libpng-3.dll
+%defattr(-,root,root,-)
+%doc ANNOUNCE CHANGES LICENSE README TODO
 %{_mingw32_bindir}/libpng-config
-%{_mingw32_bindir}/libpng12-0.dll
-%{_mingw32_bindir}/libpng12-config
-%{_mingw32_includedir}/libpng12
+%{_mingw32_bindir}/libpng14-14.dll
+%{_mingw32_bindir}/libpng14-config
+%{_mingw32_includedir}/libpng14
 %{_mingw32_includedir}/png.h
 %{_mingw32_includedir}/pngconf.h
-%{_mingw32_libdir}/libpng.dll.a
 %{_mingw32_libdir}/libpng.la
-%{_mingw32_libdir}/libpng12.a
-%{_mingw32_libdir}/libpng12.dll.a
-%{_mingw32_libdir}/libpng12.la
+%{_mingw32_libdir}/libpng14.a
+%{_mingw32_libdir}/libpng14.dll.a
+%{_mingw32_libdir}/libpng14.la
 %{_mingw32_libdir}/pkgconfig/libpng.pc
-%{_mingw32_libdir}/pkgconfig/libpng12.pc
+%{_mingw32_libdir}/pkgconfig/libpng14.pc
 
 
 %changelog
+* Sun Jul  4 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.4.3-1
+- Update to 1.4.3
+- Fixes CVE-2010-1205 (BZ #608238)
+- Fixes CVE-2010-2249 (BZ #608644)
+- Use %%global instead of %%define
+- Fixed %%defattr tag
+- Dropped unneeded patches
+
 * Fri Nov 20 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.2.40-2
 - In the previous build no symbols were exported in the resulting DLL making this
   package unusable. This should be fixed for now (but may need more research)
diff --git a/sources b/sources
index 866aacd..386932d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29bbd1c3cbe54b04bfc2bda43067ccb5  libpng-1.2.40.tar.bz2
+9347eeda4241401f7da4dc9ba7f6a416  libpng-1.4.3.tar.bz2