From a121d0989fad27900332d0ca059c0117f61807e3 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 07:45:27 +0000
Subject: [PATCH] auto-import changelog data from libpng-1.2.6-1.src.rpm
 1.2.6-1 - Update to 1.2.6 - Combine patches

---
 .cvsignore  |  2 +-
 libpng.spec | 16 +++++++---------
 sources     |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index bcbfbbc..127849c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libpng-1.2.5.tar.bz2
+libpng-1.2.6.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index 46f79ca..fdef545 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,14 +1,11 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
-Version: 1.2.5
-Release: 9
+Version: 1.2.6
+Release: 1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
-Patch0: libpng-1.2.5-rhconf.patch
-Patch1: libpng-1.2.2-libdirfix.patch
-Patch2: libpng-1.2.5-misc.patch
-Patch3: libpng-1.2.5-security.patch
+Patch0: libpng-1.2.6-rhconf.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -46,9 +43,6 @@ the libpng package.
 
 ln -s scripts/makefile.linux Makefile
 %patch0 -p1 -b .rhconf
-%patch1 -p1 -b .libdirfix
-%patch2 -p1 -b .misc
-%patch3 -p1 -b .security
 
 %build
 make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
@@ -81,6 +75,10 @@ make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Aug 17 2004 Matthias Clasen <mclasen@redhat.com> - 2:1.2.6-1
+- Update to 1.2.6
+- Combine patches
+
 * Wed Aug 4 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.5-9
 - Build for FC3
 
diff --git a/sources b/sources
index a270a98..f42b3b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fc28af730f12ace49b14568de4ad934  libpng-1.2.5.tar.bz2
+2518e496ad45c3531285b58016a6be5c  libpng-1.2.6.tar.bz2