diff --git a/.cvsignore b/.cvsignore
index e7cb51e..3ce69ab 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-libpng-1.2.6.tar.bz2
-libpng-1.2.7.tar.bz2
-libpng-1.2.8.tar.bz2
+libpng-1.2.10.tar.bz2
diff --git a/libpng.spec b/libpng.spec
index 5f53a2d..5c44885 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
-Version: 1.2.8
-Release: 2.2.1
+Version: 1.2.10
+Release: 1
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -27,7 +27,7 @@ files.
 %package devel
 Summary: Development tools for programs to manipulate PNG image format files.
 Group: Development/Libraries
-Requires: libpng = %{epoch}:%{version}, zlib-devel
+Requires: libpng = %{epoch}:%{version}-%{release}, zlib-devel
 
 %description devel
 The libpng-devel package contains the header files and static
@@ -41,16 +41,15 @@ the libpng package.
 %prep
 %setup -q
 
-ln -s scripts/makefile.linux Makefile
-%patch0 -p1 -b .rhconf
-
 %build
-make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
+%configure
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
+%makeinstall
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libpng12.{a,la}
 
 %post -p /sbin/ldconfig
 
@@ -66,7 +65,6 @@ make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
 %defattr(-,root,root)
 %{_bindir}/*
 %{_includedir}/*
-%{_libdir}/libpng*.a
 %{_libdir}/libpng*.so
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
@@ -75,6 +73,10 @@ make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu May  4 2006 Matthias Clasen  <mclasen@redhat.com>  - 2:1.2.10-1
+- Update to 1.2.10
+- Drop static libraries
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2:1.2.8-2.2.1
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index da14e79..442a103 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-00cea4539bea4bd34cbf8b82ff9589cd  libpng-1.2.8.tar.bz2
+4f23eebd59ddd01a8f91ff8c823dd7d6  libpng-1.2.10.tar.bz2