rpms/libpng/devel .cvsignore, 1.10, 1.11 libpng.spec, 1.27, 1.28 sources, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libpng/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21287

Modified Files:
	.cvsignore libpng.spec sources 
Log Message:
1.2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Dec 2004 16:12:31 -0000	1.10
+++ .cvsignore	4 May 2006 13:39:29 -0000	1.11
@@ -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


Index: libpng.spec
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/libpng.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libpng.spec	11 Feb 2006 04:11:17 -0000	1.27
+++ libpng.spec	4 May 2006 13:39:29 -0000	1.28
@@ -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 @@
 %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 @@
 %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 @@
 %defattr(-,root,root)
 %{_bindir}/*
 %{_includedir}/*
-%{_libdir}/libpng*.a
 %{_libdir}/libpng*.so
 %{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
@@ -75,6 +73,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu May  4 2006 Matthias Clasen  <mclasen at redhat.com>  - 2:1.2.10-1
+- Update to 1.2.10
+- Drop static libraries
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:1.2.8-2.2.1
 - bump again for double-long bug on ppc(64)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libpng/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Dec 2004 16:12:31 -0000	1.10
+++ sources	4 May 2006 13:39:29 -0000	1.11
@@ -1 +1 @@
-00cea4539bea4bd34cbf8b82ff9589cd  libpng-1.2.8.tar.bz2
+4f23eebd59ddd01a8f91ff8c823dd7d6  libpng-1.2.10.tar.bz2