diff --git a/.cvsignore b/.cvsignore
index 7089a26..bcbfbbc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-libpng-1.2.2.tar.bz2
-libpng-1.2.2patch03-makefiles.tar.gz
+libpng-1.2.5.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index 5d97af2..fc28712 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,15 +1,13 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
-Version: 1.2.2
-Release: 22
+Version: 1.2.5
+Release: 1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
-Source2: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.2patch03-makefiles.tar.gz
-Patch0: libpng-1.2.2-rhconf.patch
-Patch1: libpng-1.0.9-badchunks.patch
-Patch2: libpng-1.2.2-libdirfix.patch
-Patch3: libpng-1.2.2-oob_error_message.patch
+Patch0: libpng-1.2.5-rhconf.patch
+Patch1: libpng-1.2.2-libdirfix.patch
+Patch2: libpng-1.2.5-oob_error_message.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -44,14 +42,11 @@ the libpng package.
 
 %prep
 %setup -q
-## dump in the fixed makefiles (remove this with 1.2.3, presumably)
-(cd scripts && tar zxf %{SOURCE2})
 
 ln -s scripts/makefile.linux Makefile
 %patch0 -p1 -b .rhconf
-%patch1 -p1 -b .badchunk
-%patch2 -p1 -b .libdirfix
-%patch3 -p1 -b .oob_error_message
+%patch1 -p1 -b .libdirfix
+%patch2 -p1 -b .oob_error_message
 
 %build
 make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
@@ -60,15 +55,6 @@ make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 
 make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{3,5}
-install -c -m 644 *.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install -c -m 644 *.5 $RPM_BUILD_ROOT%{_mandir}/man5
-
-ln -s libpng12/png.h $RPM_BUILD_ROOT%{_includedir}
-ln -s libpng12/pngconf.h $RPM_BUILD_ROOT%{_includedir}
-
-# I don't know what this is doing here.
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
 
 %post -p /sbin/ldconfig
 
@@ -82,6 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/*
 %{_includedir}/*
 %{_libdir}/libpng*.a
 %{_libdir}/libpng*.so
@@ -92,6 +79,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed May 19 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.5-1
+- 1.2.5
+
 * Mon May 3 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.2-22
 - Redo the out-of-bounds fix in a slightly better way.
 
diff --git a/sources b/sources
index 90aae69..a270a98 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0a22ea644cb8d0c86d32e2d2d008ea40  libpng-1.2.2.tar.bz2
-6a7b4d702a03e5bb930e53f34c1e7330  libpng-1.2.2patch03-makefiles.tar.gz
+3fc28af730f12ace49b14568de4ad934  libpng-1.2.5.tar.bz2