rpms/libpng10/devel .cvsignore, 1.20, 1.21 libpng10.spec, 1.29, 1.30 sources, 1.20, 1.21 libpng-1.0.45-garbage.patch, 1.1, NONE

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22522

Modified Files:
	.cvsignore libpng10.spec sources 
Removed Files:
	libpng-1.0.45-garbage.patch 
Log Message:
garbage removal patch upstreamed


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Jun 2009 14:15:26 -0000	1.20
+++ .cvsignore	18 Jun 2009 19:59:38 -0000	1.21
@@ -1 +1 @@
-libpng-1.0.45.tar.bz2
+libpng-1.0.46.tar.bz2


Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libpng10.spec	18 Jun 2009 19:41:33 -0000	1.29
+++ libpng10.spec	18 Jun 2009 19:59:38 -0000	1.30
@@ -1,13 +1,12 @@
 Summary:	Old version of libpng, needed to run old binaries
 Name:		libpng10
-Version:	1.0.45
-Release:	2%{?dist}
+Version:	1.0.46
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 URL:		http://www.libpng.org/pub/png/libpng.html
 Source:		ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-%{version}.tar.bz2
 Patch0:		libpng-1.0.38-soname.patch
-Patch1:		libpng-1.0.45-garbage.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	zlib-devel
 Conflicts:	libpng < 2:1.2.0
@@ -39,9 +38,6 @@ libpng10-devel.
 # We want an soname of 2.%{version}
 %patch0 -p1 -b .soname
 
-# Patch out garbage in devel config files left over from edit gone wrong
-%patch1 -p1 -b .garbage
-
 %build
 %configure \
 	--disable-static \
@@ -115,6 +111,9 @@ libpng10-devel.
 %{_libdir}/pkgconfig/libpng10.pc
 
 %changelog
+* Thu Jun 18 2009 Paul Howarth <paul at city-fan.org> 1.0.46-1
+- garbage removal patch upstreamed
+
 * Thu Jun 18 2009 Paul Howarth <paul at city-fan.org> 1.0.45-2
 - patch out garbage in devel config files left over from edit gone wrong
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Jun 2009 14:15:26 -0000	1.20
+++ sources	18 Jun 2009 19:59:38 -0000	1.21
@@ -1 +1 @@
-837f68624bcf41dabec817cf94731024  libpng-1.0.45.tar.bz2
+dea0945e3c1675bf9ed1c6ab97f5f7ef  libpng-1.0.46.tar.bz2


--- libpng-1.0.45-garbage.patch DELETED ---