rpms/libpng10/devel libpng-1.0.45-garbage.patch, NONE, 1.1 libpng10.spec, 1.28, 1.29
Paul Howarth
pghmcfc at fedoraproject.org
Thu Jun 18 19:42:04 UTC 2009
Author: pghmcfc
Update of /cvs/pkgs/rpms/libpng10/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18683
Modified Files:
libpng10.spec
Added Files:
libpng-1.0.45-garbage.patch
Log Message:
Patch out garbage in devel config files left over from edit gone wrong
libpng-1.0.45-garbage.patch:
--- NEW FILE libpng-1.0.45-garbage.patch ---
diff -ur libpng-1.0.45.orig/scripts/libpng-config.in libpng-1.0.45/scripts/libpng-config.in
--- libpng-1.0.45.orig/scripts/libpng-config.in 2009-05-02 12:31:23.000000000 +0100
+++ libpng-1.0.45/scripts/libpng-config.in 2009-06-18 15:09:05.000000000 +0100
@@ -19,8 +19,7 @@
L_opts="-L${libdir}"
R_opts=""
cppflags=""
-%12-%ccopts="@LIBPNG_NO_MMX@"
-%14+%ccopts=""
+ccopts="@LIBPNG_NO_MMX@"
ldopts=""
usage()
diff -ur libpng-1.0.45.orig/scripts/libpng.pc-configure.in libpng-1.0.45/scripts/libpng.pc-configure.in
--- libpng-1.0.45.orig/scripts/libpng.pc-configure.in 2009-05-02 12:34:13.000000000 +0100
+++ libpng-1.0.45/scripts/libpng.pc-configure.in 2009-06-18 15:11:18.000000000 +0100
@@ -8,5 +8,4 @@
Version: @PNGLIB_VERSION@
Libs: -L${libdir} -lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@
Libs.private: @LIBS@
-%12-%Cflags: -I${includedir} @LIBPNG_NO_MMX@
-%14+%Cflags: -I${includedir}
+Cflags: -I${includedir} @LIBPNG_NO_MMX@
diff -ur libpng-1.0.45.orig/scripts/makefile.freebsd libpng-1.0.45/scripts/makefile.freebsd
--- libpng-1.0.45.orig/scripts/makefile.freebsd 2009-05-02 13:12:53.000000000 +0100
+++ libpng-1.0.45/scripts/makefile.freebsd 2009-06-18 15:10:16.000000000 +0100
@@ -3,8 +3,7 @@
# For conditions of distribution and use, see copyright notice in png.h
PREFIX?= /usr/local
-%12-%SHLIB_VER?= 5
-%14+%SHLIB_VER?= %SONUM%
+SHLIB_VER?= 5
LIB= png
SHLIB_MAJOR= ${SHLIB_VER}
@@ -26,9 +25,9 @@
DPADD+= ${LIBM} ${LIBZ}
CFLAGS+= -I.
-%12-%.if (${MACHINE_ARCH} != "i386")
-%12-%CFLAGS+= -DPNG_NO_MMX_CODE
-%12-%.endif
+.if (${MACHINE_ARCH} != "i386")
+CFLAGS+= -DPNG_NO_MMX_CODE
+.endif
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
diff -ur libpng-1.0.45.orig/scripts/makefile.vcawin32 libpng-1.0.45/scripts/makefile.vcawin32
--- libpng-1.0.45.orig/scripts/makefile.vcawin32 2009-05-02 13:32:49.000000000 +0100
+++ libpng-1.0.45/scripts/makefile.vcawin32 2009-06-18 15:09:39.000000000 +0100
@@ -6,14 +6,13 @@
# To use, do "nmake /f scripts\makefile.vcawin32"
# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
-%12-%# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead.
+# If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead.
# Compiler, linker, librarian, and other tools
CC = cl
LD = link
AR = lib
-%12-%CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib
-%14+%CFLAGS = -nologo -MD -O2 -W3 -I..\zlib
+CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib
LDFLAGS = -nologo
ARFLAGS = -nologo
RM = del
diff -ur libpng-1.0.45.orig/scripts/makefile.vcwin32 libpng-1.0.45/scripts/makefile.vcwin32
--- libpng-1.0.45.orig/scripts/makefile.vcwin32 2009-05-02 13:26:36.000000000 +0100
+++ libpng-1.0.45/scripts/makefile.vcwin32 2009-06-18 15:10:44.000000000 +0100
@@ -6,14 +6,13 @@
# To use, do "nmake /f scripts\makefile.vcwin32"
# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
-%12-%# If you want to use assembler (MMX) code, use makefile.vcawin32 instead.
+# If you want to use assembler (MMX) code, use makefile.vcawin32 instead.
# Compiler, linker, librarian, and other tools
CC = cl
LD = link
AR = lib
-%12-%CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib
-%14+%CFLAGS = -nologo -MD -O2 -W3 -I..\zlib
+CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib
LDFLAGS = -nologo
ARFLAGS = -nologo
RM = del
Index: libpng10.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpng10/devel/libpng10.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- libpng10.spec 4 Jun 2009 14:15:26 -0000 1.28
+++ libpng10.spec 18 Jun 2009 19:41:33 -0000 1.29
@@ -1,12 +1,13 @@
Summary: Old version of libpng, needed to run old binaries
Name: libpng10
Version: 1.0.45
-Release: 1%{?dist}
+Release: 2%{?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
@@ -38,6 +39,9 @@ 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 \
@@ -111,6 +115,9 @@ libpng10-devel.
%{_libdir}/pkgconfig/libpng10.pc
%changelog
+* 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
+
* Thu Jun 4 2009 Paul Howarth <paul at city-fan.org> 1.0.45-1
- update to 1.0.45 (mainly cosmetic code changes)
More information about the fedora-extras-commits
mailing list